Merge "Change transfer list format to include block hashes"