Merge into CM-10.1 branch