Issue #23021:honor location restrictions