Changes from CM repo