Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev