VE-1026

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