Merge remote-tracking branch 'remotes/origin/main' into 861-masa-br-switching-crashes-with-instrumented-code