Merge pull request #17778 from totten/master-setup-validate