Merge pull request #1942 from Wikia/ve-sprint-5

Ve sprint 5