case 2423 - Teaser display export.
Merge branch 'case-2423' into develop