Merge branch 'stf606-draft' into 'stf606-final'

Fix on missing datamodels

See merge request !7
4 jobs for stf606-final in 0 seconds (queued for 2 seconds)