Merge branch 'stf606-final' into 'master'

Fix on missing datamodels

See merge request !8
7 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 11 seconds