Merge branch 'release/2.0.0'
Group content elements in user settings
Merge branch 'hotfix/2.0.1' into develop