Merge pull request #4814 from Wikia/MOB-2603

Mob 2603