Code review
Merge pull request #1774 from kaltura/IX-9.19.5-PLAT-1960

Code review