Merge branch 'main' into cleanup-dft-stereo-debug-switches