Merge branch 'main' into 577-some-ism-modes-crash-in-instrumented-codec-build-but-not-in-normal-build
