Merge 27 commit cm12.0