Merge branch 'main' into 62-add-sanitizer-tests-to-ci