Merge remote-tracking branch 'remotes/origin/main' into 1052-sba-decoder-confused-with-ext-output