Feature: misc refactorings and improvements

Houcem Kacemrequested to merge
feature/misc-refactorings-and-improvements into develop

Merge request reports