Merge pull request #20625 from osalbahr/config-prioritize-pretty-name

Merge pull request #20625 from osalbahr/config-prioritize-pretty-name #19335