Re #7818 Fix masking issue
Merge remote-tracking branch 'origin/feature/7818_fix_side_masking'