merge plat-599
Merge pull request #895 from kaltura/IX-9.12.0-merge-PLAT-599

merge plat-599