merging cm's latest changes