case 3976 - Panel export.
Merge branch 'case-3976' into develop