Merge branch 'chore/spelling' into 'develop'