Merge branch 'modeling-users' into 'master'

Modeling users

See merge request !5
Status Job ID Name Coverage
  Build
canceled #3650
build

 
  Test
canceled #3652
allowed to fail
codequality

canceled #3651
test