Merge pull request #5184 from Wikia/ve-sprint-29

VE Sprint 29