update with latest CM commits