Merge remote-tracking branch 'remotes/origin/main' into 1330-jbm-audio-channels-memory-reduction