Merge branch 'validation-fixes' into 'master'