Merge pull request #3869 from Wikia/ve-sprint-19

ve-sprint-19