Merge pull request #14885 from aydun/location_defaults