master: changes for GCP-5726