Merge pull request #4551 from Wikia/MWEB-966

MWEB-966 P2 fix