Merge branch 'v2.1-dev' into 'v2.x-master'

18: Adapt according to needs of first actual implementation (CR)

See merge request !5
3 jobs for v2.x-master in 7 minutes and 17 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #49484
test

00:01:46

 
  Build
passed #49485
build

00:02:26

 
  Deploy
passed #49486
deploy

00:03:03