Merge for release

Merged Markus Scheidgen requested to merge v0.10.4 into master

Merge request reports