additional optimization for GCP-7021 and GCP-6084