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

Task-Url: #18
1 job for v2.1-dev in 2 minutes and 15 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #50781
test

00:02:15