Merge "Fix missing operation in CombineBlocks"