Fixes the content structure for some components
Merge pull request #1172 in master
Merge pull request #1174
Merge pull request #1174 in develop