Code review updates
Merge pull request #1282 from kaltura/IX-9.17.0-LC-drop1

Code review updates