Merge branch 'hotfix/0.803'
Typos
Merge branch 'hotfix/0.8031' into develop