FEC-2458 updated branch after mergin with 2.25 fixes
Merge pull request #1352 from kaltura/FEC-2458-fix

FEC-2458 updated branch after mergin with 2.25 fixes