Merge 5 commit cm12.0