Merge "Refactor encode_superblock function"