Merge branch 'fix/support_morgen_fixxes' into 'develop'

Fix/support morgen fixes

See merge request !927
2 jobs for develop in 36 minutes and 51 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed #86695
system

00:36:50

passed #86694
test

00:09:10