Merge branch 'hotfix/typo'