Added and applied patch to media module