Merge branch 'develop' into 'master'

Final GDW Version

See merge request !30
2 jobs for master in 6 minutes and 57 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Build
passed #9148
build-clang

00:03:43

passed #9147
build-gcc

00:03:14