GCP-7443 commit remaining code