[MAGEMEP-131] Cleaning code
Merge branch 'development' into MAGEMEP-131