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