case 2119 - Subfrontpages export.
Merge branch 'case-2119' into develop