Merge pull request #14770 from totten/master-config-ids