[MAGEMEP-121] Adding compatibility with DerModPro
Merge remote branch 'origin/MAGEMEP-121' into development