New fix

Merged Andreas Marek requested to merge new_fix into master_pre_stage

Merge request reports