Fix on datamodel

Elian Krajarequested to merge
stf606-draft into stf606-final

Merge request reports