Fix: Merge caused function duplication
Fix: Merge caused function duplication
jessp01/play-server,jessp01/play-server,kaltura/play-server,kaltura/play-server,kaltura/play-server,kaltura/play-server,jessp01/play-server,jessp01/play-server,jessp01/play-server,kaltura/play-server,jessp01/play-server,kaltura/play-server