Merge pull request #16494 from mattwire/enablevalidate