Change GCP-8880 logic to support IE