Merge CM-10.2