Merge branch 'main' into disable_bwd_for_mct