[MAGEMEP-131] Cleaning code
Merge branch 'development' into MAGEMEP-131
[MAGEMEP-136] Fixing scheduled cron not executed
Merge branch 'development' into MAGEMEP-135