Merge remote-tracking branch 'remotes/origin/main' into 735-hp20-filtering-bug-in-sba-osba-bitrate-switching
