made fixes to address comments for GCP-6191