Fix for PLAT-840
Merge pull request #746 from kaltura/IX-9.9.0-PLAT-840

Fix for PLAT-840