Merge pull request #2298 from Wikia/ve-sprint-7

ve-sprint-7