Merge branch 'main' into 2072-decoder-crash-with-mc-bitrate-switching-jbm