MODE-2399 Fixed the output structure for the default-initial-content configuration.
Merge pull request #1355 from hchiorean/MODE-2399

MODE-2399 Fixed the output structure for the default-initial-content configuration.