PLAT-4830 code review
PLAT-4830 code review

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