fix previous premature merge to master

Gandalfrequested to merge
develop into master

Use !484 (merged) to fix premature merge of !481 (merged)

Merge request reports