Pull in latest developments

Oliver Falkrequested to merge
devel into master

Merge request reports