VE-893

https://wikia-inc.atlassian.net/browse/VE-893 @inez 

Pull request to sprint 16. Replaces: https://github.com/Wikia/app/pull/3358