Merge branch 'develop' into 'issue/556'

# Conflicts:
#   package/debian/changelog
2 jobs for issue/556 in 9 minutes and 52 seconds (queued for 4 seconds)
Status Name Job ID Coverage
  Build
passed build #26628
debian-packaging

00:00:25

 
  Test
passed test #26629
ubuntu regular

00:09:26