Merge branch 'issue/601' into 'develop'

SCRUM#602: Several improvements

See merge request !19
1 job for develop in 12 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Lint
passed #33808
debian-packaging
lint_shell

00:00:12