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

Task-Url: #18
1 job for v2.1-dev in 1 minute and 48 seconds
Status Job ID Name Coverage
  Test
passed #49491
test

00:01:48