Merge "Use explicit block position in foreach_transformed_block" into nextgenv2