validation code
Merge branch 'feature-regvalidation' into dev