KMS-1562
Merge pull request #526 from kaltura/IX-9.6.0-KMS-1562

KMS-1562