Merge branch 'updating-users' into 'master'

Updating users

See merge request !11
Status Job ID Name Coverage
  Build
canceled #3737
build

 
  Test
canceled #3739
allowed to fail
codequality

canceled #3738
test