Merge branch 'feat/US43-user-management' into 'dev'

feat/US43-user-management

See merge request !186
3 jobs for dev in 3 minutes and 51 seconds (queued for 2 seconds)