VE-525

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