server side validation
Merge branch 'master' into ui