GCP-6157 applied new logic based on discussion with kevin