Merge branch 'hotfix/config-fix'
fix some info
Merge branch 'hotfix/content-fix' into develop