Merge : 22 commits from cm-12.0