Merge pull request #4374 from Wikia/ve-sprint-23

VE Sprint 23