Merge pull request #384 from Wikia/p2-quick-fix-bugid-96140 as a quick p2 fix

P2 quick fix bugid 96140