Merge remote-tracking branch 'remotes/origin/main' into 1138-error-printouts-in-sba-ext-output