Merge branch 'hotfix/typo' into develop