Merge pull request #7851 from remitamine/kaltura