Merge branch 'iarna-schema-validation'