Merge branch 'master' into develop
case 2423 - Teaser display export.
Merge branch 'case-2423' into develop
Merge remote-tracking branch 'origin/develop'
Release: v1.9.6
Merge branch 'master' into halbib