Backport transform mask fixes to 5.2

Merge request reports

Loading