Fix legacy

Merged Laurent Heirendt requested to merge fix-legacy into develop

Merge request reports