Merge upstream cm-10.1 derpfix