Merge branch 'main' into 1793-fix-decoder-mc-to-mono-output-scaling