Fixed merge conflict from trunk
Merge issue  from trunk
Merge from trunk to feature/kaltura