Fix for PLAT-285
Merge pull request #241 from kaltura/IX-9.2.0-PLAT-285

Fix for PLAT-285