GCP-8302 - Fix for merging issue