Merge branch 'hotfix/fix_typos'