porting PLATFORM-308 related changes
Merge pull request #4564 from Wikia/release-240-platform-308

porting PLATFORM-308 related changes