Merge branch 'fix_1996_masking_noise' into 'main'

[non-BE] [split non-BE] [allow-regression] fix for masking noise issue

See merge request !2208