sync with latest cm commits