Improve logging
Merge branch 'add-google-auth-api'