merge dev branch into master

Hark Simon Brarenrequested to merge
develop into master

merge develop branch changes into master branch

Merge request reports