Merge branch 'main' into fix_binary_loading_tests