Fix/julien cherry path

Merged Julien Wadel requested to merge fix/julien_cherry_path into master

Merge request reports