Merge branch 'develop' into 'master'

Data directory lookup fix

See merge request !3
2 jobs for master in 5 minutes and 53 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #4765
build_deb

00:05:15

 
  Deploy
passed #4766
push_deb

00:00:38