Main 2328 r227

Checked in: https://github.com/Wikia/app/pull/3682