Merge remote-tracking branch 'origin' into 1737-high-band-difference-in-external-renderer-masa2-to-mono-5-1