Issue #23021:honor location restrictions
Merge pull request #306 from garyhgohoos/23021

Issue #23021:honor location restrictions