PLAT-7531: code review remarks
PLAT-7531: code review remarks

DBezemer/server,DBezemer/server,kaltura/server,DBezemer/server,kaltura/server,DBezemer/server,kaltura/server,kaltura/server,DBezemer/server,DBezemer/server,kaltura/server,DBezemer/server,DBezemer/server,kaltura/server