GCP-6332, GCP-6333 adjust code