Merge pull request from PAC-man/cm-10.2