Merge New Changes from CM