Merge in changes from cm-10.1 branch