Merge branch 'stf606-final' into 'master'

Fix on missing datamodels

See merge request !8
2 jobs for master in 0 seconds (queued for 2 seconds)