Merge remote-tracking branch 'remotes/origin/main' into sba-ext-fix