Merge pull request #4768 from Wikia/ve-sprint-26

VE Sprint 26