GCP-7937 - retain location values