Merge pull request #4171 from Wikia/ve-sprint-22

VE Sprint 22