Merge julien

Merged Julien Wadel requested to merge merge_julien into master

Merge request reports