Merge cm-10.2 into hlcm