porting changes from release-240
porting changes from release-240
Merge pull request #4647 from Wikia/release-241-platform-308-port

Release 241 platform 308 port