SUP 769 Post QA Fixes
Merge pull request #286 from kaltura/IX-9.3.0-SUP-769-POST-QA-FIX

SUP 769 Post QA Fixes