Rebased with latest M-C changes