Merge pull request #16112 from seamuslee001/remove_zend_validator