Con 420 (update)

https://wikia-inc.atlassian.net/browse/CON-420

first implementation: https://github.com/Wikia/app/pull/2648