Merge branch 'hotfix/hotfix-typos' into develop
Merge branch 'hotfix/fix-typos'