More fixed in the schema.
Merge branch 'test' into dev