Merge branch 'more-validations'