Merge branch 'main' into 2041-fix-spectral-gaps-for-inactive-frames