full manual merge from cm-10.2. bump to version 3.4.66