Merge "Migrate block log to new log system"