CON-2342 | Fix for FF
Fix CR
Merge pull request #5759 from Wikia/CON-2342

CON-2342 | Fix for FF