Merge branch 'hotfix/content-fix'
Damn typos
Merge branch 'hotfix/I-is-stupid' into develop