Merge branch 'fix-spellign' into 'develop'