Refactoring (cleaning)

Jerome Hilairerequested to merge
github/fork/dklein-pik/develop into develop

Created by: dklein-pik

Merge request reports