Merge pull request #2307 from benthecarman/verify-funcs