work on validator file checks.
Merge branch '4.0'