Fixes: U4-2677 Fix content/media creation for media