Mob 2087 new

A copy of https://github.com/Wikia/app/pull/4096 because `MOB-1853` was merged too quickly to `dev`. Once it's tested we'll be able to merge it directly to `dev` now.