VE-1171

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