Merge pull request #3599 from Wikia/VE-1101

VE-1101