VE-447

https://wikia-inc.atlassian.net/browse/VE-447

@inez @kflorence @kenkouot @lizlux