Merge branch 'main' into basop-2502-harmonize-generate_comfort_noise_dec_