bring in-line with cm-10.1 branch, update