Merge pull request #4272 from Wikia/VID-1769

Vid 1769