Merge 3 commit cm12.0