Merge pull request #5370 from Wikia/VID-2134

VID-2134
(cherry picked from commit 7581f24d585964d4e1c4a7cd086bf105a4fe9a2a)