Draft: Chore/code cleaning/3

TRANIER John requested to merge chore/code-cleaning/3 into dev

Merge request reports