Updates to the datamodel.
Merge branch 'userguide' into datamodel_updates
Move composition:none check to correct branch.