Merge branch 'validation' into '3.3.1-dev'

Validation

See merge request !1
3 jobs for 3.3.1-dev