Merge pull request #5698 from Wikia/ve-sprint-33

VE Sprint 33