VE-1467

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