Merge branch 'main' into 1764-update_renorm_for_stereo_dmx