ps:CR-183201 un-revert
Merge pull request #1690 from kaltura/CR-183201

ps:CR-183201 un-revert