Fix for PLAT-842
Merge pull request #729 from kaltura/IX-9.9.0-PLAT-841

Fix for PLAT-842