Merge branch '744_step3_code_changes' into 744_step4_hrtf_binary_tests