Merge branch 'hotfix/fix_typos'
Merge branch 'master' into develop