1 method added to ValidateFields .
Merge origin/master