Issue #22851:add support for new default locations
Merge pull request #132 from garyhgohoos/22851

Issue #22851:add support for new default locations