last stable stay
Merge commit '98db96ee98a9d8ff7ff4439dc7e1a77a6a0e6038' into google_maps
Before merge with Master