GCP-6125 fix build issue