google api logs and possible fix
Merge branch 'hotfix/0.5.5'