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

This reverts commit 5e90398ca0a2bb7b6c6780dc7cfc667c21e6cdf8.