validation for the public part
Merge branch 'publicPartValidation' into dev