Add a field validation factory.
Merge branch 'develop'