Merge from CM branch.