fixes for PLAT-1011 and PLAT-1019
Merge pull request #926 from kaltura/IX-9.12.0-PLAT-1007

fixes for PLAT-1011 and PLAT-1019