Merge branch 'main' into hrtf_improvements_basop_2