Merge pull request #6851 from eileenmcnaughton/CRM-17176-location-46