Merge branch 'fix/small_fixes_mr_number_two' into 'develop'

Fix/small fixes mr number two

See merge request !940
2 jobs for develop in 37 minutes and 14 seconds (queued for 21 seconds)
Status Job ID Name Coverage
  Test
passed #94922
system

00:37:14

passed #94921
test

00:09:03