squashed merge from cm-10.2