Merge remote-tracking branch 'origin/main' into 318-use-of-uninitialized-value-error-in-sba-br-switching-with-frame-errors