Merge branch 'fix/several_small_text_and_other_changes' into 'develop'

Fix/several small text and other changes

See merge request !939
2 jobs for develop in 36 minutes and 20 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Test
passed #94820
system

00:36:20

passed #94819
test

00:09:03