sync to master
+ readded service recreation code for kitkat