Added and applied patch for media - fix feature export