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

VE Sprint 29