Merge 4 commit cm12.0