Merge "Cleanup comments for the new control block implementation"