Merge "Fix spell checker framework"