Merge branch 'main' into 15-move-proximity-mixing-to-the-decoder