Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev