merge PLAT-599 to IX-9.11.0
Merge pull request #853 from kaltura/IX-9.11.0-PLAT-599

merge PLAT-599 to IX-9.11.0