Merge pull request #11664 from eileenmcnaughton/geo