Merge branch 'main' into basop-2338-harmonise-duplication-of-comp_and_apply_gain_fx