Merge branch 'main' into fix_1996_masking_noise