Merge branch '861-masa-br-switching-crashes-with-instrumented-code' into 'main'

[Non-BE] Resolve "MASA BR switching crashes with instrumented code"

See merge request !1166