Fix for SUP-1322
Fix after testing
Merge pull request #788 from kaltura/IX-9.10.0-SUP-1322

Ix 9.10.0 sup 1322