Add MediaHeader
Populate MediaHeader in Response
Merge branch 'mediaheader'