Changes done in the MR 476 cherry-picked into master.

Bartek Wronarequested to merge
cherry-pick-31529ec2 into master

#issue 134

See merge request !476 (merged)

(cherry picked from commit 31529ec2)

Merge request reports