Merge branch 'release#1.0.0'
Updated the content
Merge branch 'hotfix#emergency-content-update'
Merge branch 'master' into develop