merged from sprint1 successfully

2 jobs for !17 with sprint1_steffen in 6 minutes and 37 seconds (queued for 6 minutes and 16 seconds)
merge request