Merge Remi's changes into Rheya branch

Merge Remi's changes into Rheya branch

Merge request reports

Loading