Validation, first version.
Merge origin/master
Merge origin/master