Merge branch 'hrtf_improvements_basop_2' into 1963_basop_portFltMR-1568-1471-1690