Merge branch 'main' into float-1546-dft-stereo-dead-code