Overcome buffering issues
PLAT-692 #time 4h
Merge pull request #1097 from kaltura/IX-9.15.0-PLAT-692-5

Overcome buffering issues