[BUGFIX beta] Rewrite with transform to use block params
Merge pull request #10009 from mmun/block-param-transforms

[BUGFIX beta] Rewrite with transform to use block params