Merge remote-tracking branch 'origin/hotfix' into develop
case 3025 - Fixed info file to avoid conflicts with artesis FE module.
Merge branch 'develop'