Merge in CM-12.0 branch