PLAT-464
Merge pull request #429 from kaltura/IX-9.5.0-PLAT-464

PLAT-464