case 2134 - Full content display export.
Merge branch 'case-2134' into develop