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

SUP 769 Post QA Fixes