Mini fix for GCP-8003
Merge remote-tracking branch 'origin/master'