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

Task-Url: #18
1 job for v2.1-dev in 1 minute and 37 seconds (queued for 1 second)