Merge 0.8

Merged Michael Scharfenberg requested to merge servant into master

Merge commit for 0.8

Merge request reports