Merge branch 'main' into 722-memory-leak-in-mc-paramupmix-with-bitrate-switching