Feature 4281

Merged Benjamin Baer requested to merge feature_4281 into master

Fixing the problem for now.

Merge request reports