KMS-1562
Merge pull request #525 from kaltura/IX-9.5.0-KMS-1562

KMS-1562