Updates from cm-10.2 tested and working