Merge branch 'issue/611' into 'develop'

SCRUM#611: Prevents conflicts during dist-upgrade

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

00:00:12