Merge pull request #4136 from Wikia/MOB-2034

MOB-2034