Merge branch 'Spell-dev'