Schema for adapt origin
Increment version
Remove generic schema elements
Merge branch 'jsonschema' into develop