Transition to 6.0

Merged Quentin Arguillere requested to merge feature/transition_to_version_6_0 into master

Merge request reports