Squashed update to CM's latest