Merge "Fix CombineBlocks optimization"