Hotfix

Oliver Falkrequested to merge
devel into master

Some hotfixes for production.

Merge request reports