VE-893

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