Issue #22851:add support for new default locations