GCP-6091 additional for single location