Merge branch 'main' into 1165-static-scaling-for-downmixes