KMS-1562
Merge pull request #392 from kaltura/IX-9.3.1-KMS-1562

KMS-1562