refs #2732 - added highlight content type
Merged conflicts
Merge branch 'eugenst-2732_highlight' into develop