Update CM to the latest
Merge branch 'newmaster' into themes-v1