Merge remote-tracking branch 'remotes/origin/main' into 759-code-coverage-osba