Local sanitization of variables
Merge pull request #3000 from Wikia/MAIN-1879

MAIN-1879: Local sanitization of variables