Merge branch 'develop-googleService' into develop