XD-692 using MessageHeaders.CONTENT_TYPE
Merge branch 'XD-692'