Fixes #8747 - Temporary pin for google_api_client gem
Merge remote branch 'origin/develop' into develop