VE-894

https://wikia-inc.atlassian.net/browse/VE-894 @inez