Merge branch 'main' into split_rendering_masa_and_mc_fixes