Merge pull request #22237 from totten/master-verifydb