fix on merge

Merged Piotr Gawron requested to merge fix-merge into master

Merge request reports