Backend updates

Merged adietmue requested to merge backend-updates into master

Merge request reports