VE-1338: Pull in change from upstream

https://wikia-inc.atlassian.net/browse/VE-1338