Importing changes from release-158 to dev.
Merge pull request #673 from Wikia/hawelcome-import-from-release-158

Importing changes from release-158 to dev.