Merge pull request #2177 from Wikia/ve-sprint-7

VE Sprint 7