Update with latest m-c changes