Merge pull request #3421 from Wikia/VE-969

VE-969