Hot fix

Merged Hanna JULIENNE requested to merge hot_fix into master

Merge request reports