Merge branch '735-hp20-filtering-bug-in-sba-osba-bitrate-switching' into 'main'

[non-BE] Resolve "HP20 filtering bug in SBA/OSBA bitrate switching"

See merge request !1013