Merge branch '1963_ref_portFltMR-1568-1471-1690' into hrtf_improvements_ref