[MAGEMEP-113] Fixing urls problems
Merge remote branch 'origin/MAGEMEP-113' into development