Merge branch 'data-model-update' into 'master'

Data model update

See merge request !1
1 job for master
Status Job ID Name Coverage
  Test
canceled #24844
allowed to fail
code_quality