MWEB-965

Continuation of https://github.com/Wikia/app/pull/4899 we forgot to merge all the changes to MWEB-965 before merging it to dev :(