Merge branch 'main' into hrtf_file_updates_for_delivery