refactor GCP 5732