Import fixes from dev.
Merge pull request #696 from Wikia/release-161-hawelcome-fixes-from-dev

Import fixes from dev.