Merge branch 'master' into 'issue/391'

# Conflicts:
#   package/debian/changelog
2 jobs for issue/391 in 1 minute and 45 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #22330
debian-packaging
build

00:00:23

 
  Test
passed #22331
ubuntu regular
test

00:01:21