incorporate changes from dev

Fabian Nuraddin Alexander Gabelrequested to merge
dev into master

Rundgang video and Karsten Kruse Research topics

Merge request reports