Merge branch 'master' into bratseth/stemming-trace

65 files changed, 410 insertions, 73 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/RankProfile.java b/config-model/src/main/java/com/yahoo/schema/RankProfile.java
index cdefbbf8174..60674b5487c 100644
--- a/config-model/src/main/java/com/yahoo/schema/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/RankProfile.java
@@ -222,9 +222,10 @@ public class RankProfile implements Cloneable {
         this.useSignificanceModel = useSignificanceModel;
     }
 
-    public Boolean useSignificanceModel() {
+    public boolean useSignificanceModel() {
         if (useSignificanceModel != null) return useSignificanceModel;
-        return uniquelyInherited(p -> p.useSignificanceModel(), "use-model").orElse(null);
+        return uniquelyInherited(p -> p.useSignificanceModel(), "use-model")
+                .orElse(false); // Disabled by default
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
index 42586fa7d75..b057624f055 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
@@ -186,7 +186,6 @@ public class RawRankProfile {
         private RankingExpression globalPhaseRanking;
         private final int globalPhaseRerankCount;
         private final SerializationContext functionSerializationContext;
-        private Boolean useSignificanceModel;
 
         /**
          * Creates a raw rank profile from the given rank profile
@@ -222,7 +221,6 @@ public class RawRankProfile {
             rankScoreDropLimit = compiled.getRankScoreDropLimit();
             ignoreDefaultRankFeatures = compiled.getIgnoreDefaultRankFeatures();
             rankProperties = new ArrayList<>(compiled.getRankProperties());
-            useSignificanceModel = compiled.useSignificanceModel();
 
             Map<String, RankProfile.RankingExpressionFunction> functions = compiled.getFunctions();
             List<ExpressionFunction> functionExpressions = functions.values().stream().map(RankProfile.RankingExpressionFunction::function).toList();
@@ -481,9 +479,6 @@ public class RawRankProfile {
             if (targetHitsMaxAdjustmentFactor.isPresent()) {
                 properties.add(new Pair<>("vespa.matching.nns.target_hits_max_adjustment_factor", String.valueOf(targetHitsMaxAdjustmentFactor.getAsDouble())));
             }
-            if (useSignificanceModel != null) {
-                properties.add(new Pair<>("vespa.significance.use_model", String.valueOf(useSignificanceModel)));
-            }
             if (matchPhaseSettings != null) {
                 properties.add(new Pair<>("vespa.matchphase.degradation.attribute", matchPhaseSettings.getAttribute()));
                 properties.add(new Pair<>("vespa.matchphase.degradation.ascendingorder", matchPhaseSettings.getAscending() + ""));
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/SchemaInfo.java b/config-model/src/main/java/com/yahoo/schema/derived/SchemaInfo.java
index f996b2624db..b91404be2dd 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/SchemaInfo.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/SchemaInfo.java
@@ -183,10 +183,12 @@ public final class SchemaInfo extends Derived {
 
     private void addRankProfilesConfig(SchemaInfoConfig.Schema.Builder schemaBuilder) {
         for (RankProfileInfo rankProfile : rankProfiles().values()) {
-            var rankProfileConfig = new SchemaInfoConfig.Schema.Rankprofile.Builder();
-            rankProfileConfig.name(rankProfile.name());
-            rankProfileConfig.hasSummaryFeatures(rankProfile.hasSummaryFeatures());
-            rankProfileConfig.hasRankFeatures(rankProfile.hasRankFeatures());
+            var rankProfileConfig = new SchemaInfoConfig.Schema.Rankprofile.Builder()
+                    .name(rankProfile.name())
+                    .hasSummaryFeatures(rankProfile.hasSummaryFeatures())
+                    .hasRankFeatures(rankProfile.hasRankFeatures())
+                    .significance(new SchemaInfoConfig.Schema.Rankprofile.Significance.Builder()
+                                          .useModel(rankProfile.useSignificanceModel()));
             for (var input : rankProfile.inputs().entrySet()) {
                 var inputConfig = new SchemaInfoConfig.Schema.Rankprofile.Input.Builder();
                 inputConfig.name(input.getKey().toString());
@@ -226,6 +228,7 @@ public final class SchemaInfo extends Derived {
         private final String name;
         private final boolean hasSummaryFeatures;
         private final boolean hasRankFeatures;
+        private final boolean useSignificanceModel;
         private final Map<Reference, RankProfile.Input> inputs;
 
         public RankProfileInfo(RankProfile profile) {
@@ -233,11 +236,13 @@ public final class SchemaInfo extends Derived {
             this.hasSummaryFeatures =  ! profile.getSummaryFeatures().isEmpty();
             this.hasRankFeatures =  ! profile.getRankFeatures().isEmpty();
             this.inputs = profile.inputs();
+            useSignificanceModel = profile.useSignificanceModel();
         }
 
         public String name() { return name; }
         public boolean hasSummaryFeatures() { return hasSummaryFeatures; }
         public boolean hasRankFeatures() { return hasRankFeatures; }
+        public boolean useSignificanceModel() { return useSignificanceModel; }
         public Map<Reference, RankProfile.Input> inputs() { return inputs; }
 
     }
diff --git a/config-model/src/main/java/com/yahoo/schema/document/Matching.java b/config-model/src/main/java/com/yahoo/schema/document/Matching.java
index 9d68553fa80..33256fa8586 100644
--- a/config-model/src/main/java/com/yahoo/schema/document/Matching.java
+++ b/config-model/src/main/java/com/yahoo/schema/document/Matching.java
@@ -33,6 +33,8 @@ public class Matching implements Cloneable, Serializable {
     private Integer maxLength;
     /** Maximum number of occurrences for each term */
     private Integer maxTermOccurrences;
+    /** Maximum number of characters in a token. */
+    private Integer maxTokenLength;
 
     private String exactMatchTerminator = null;
 
@@ -61,6 +63,8 @@ public class Matching implements Cloneable, Serializable {
     public Matching maxLength(int maxLength) { this.maxLength = maxLength; return this; }
     public Integer maxTermOccurrences() { return maxTermOccurrences; }
     public Matching maxTermOccurrences(int maxTermOccurrences) { this.maxTermOccurrences = maxTermOccurrences; return this; }
+    public Integer maxTokenLength() { return maxTokenLength; }
+    public Matching maxTokenLength(int maxTokenLength) { this.maxTokenLength = maxTokenLength; return this; }
     public boolean isTypeUserSet() { return typeUserSet; }
 
     public MatchAlgorithm getAlgorithm() { return algorithm; }
diff --git a/config-model/src/main/java/com/yahoo/schema/document/SDField.java b/config-model/src/main/java/com/yahoo/schema/document/SDField.java
index f165141b16e..2483fa47667 100644
--- a/config-model/src/main/java/com/yahoo/schema/document/SDField.java
+++ b/config-model/src/main/java/com/yahoo/schema/document/SDField.java
@@ -46,7 +46,7 @@ import java.util.TreeMap;
  *
  * @author bratseth
  */
-public class SDField extends Field implements TypedKey, ImmutableSDField {
+public class SDField extends Field implements ImmutableSDField {
 
     /** Use this field for modifying index-structure, even if it doesn't have any indexing code */
     private boolean indexStructureField = false;
@@ -315,7 +315,7 @@ public class SDField extends Field implements TypedKey, ImmutableSDField {
                     supplyStructField.accept(field.getName(), field.getDataType());
                 }
             }
-            if ((subType == null) && (structFields.size() > 0)) {
+            if ((subType == null) && (!structFields.isEmpty())) {
                 throw new IllegalArgumentException("Cannot find matching (repo=" + sdoc + ") for subfields in "
                                                    + this + " [" + getDataType() + getDataType().getClass() +
                                                    "] with " + structFields.size() + " struct fields");
@@ -627,7 +627,7 @@ public class SDField extends Field implements TypedKey, ImmutableSDField {
 
     public Attribute addAttribute(Attribute attribute) {
         String name = attribute.getName();
-        if (name == null || "".equals(name)) {
+        if (name == null || name.isEmpty()) {
             name = getName();
             attribute.setName(name);
         }
diff --git a/config-model/src/main/java/com/yahoo/schema/document/TypedKey.java b/config-model/src/main/java/com/yahoo/schema/document/TypedKey.java
deleted file mode 100644
index 652d21d7f7d..00000000000
--- a/config-model/src/main/java/com/yahoo/schema/document/TypedKey.java
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.schema.document;
-
-import com.yahoo.document.DataType;
-
-/**
- * Common interface for various typed key (or field definitions).
- * Used by code which wants to use common algorithms for dealing with typed keys, like the logical mapping
- *
- * @author bratseth
- */
-public interface TypedKey {
-
-    String getName();
-
-    void setDataType(DataType type);
-
-    DataType getDataType();
-
-}
diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java
index 7659a1e6562..173eebe2a94 100644
--- a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java
+++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java
@@ -44,6 +44,7 @@ public class ConvertParsedFields {
         parsed.getGramSize().ifPresent(gramSize -> field.getMatching().setGramSize(gramSize));
         parsed.getMaxLength().ifPresent(maxLength -> field.getMatching().maxLength(maxLength));
         parsed.getMaxTermOccurrences().ifPresent(maxTermOccurrences -> field.getMatching().maxTermOccurrences(maxTermOccurrences));
+        parsed.getMaxTokenLength().ifPresent(maxTokenLength -> field.getMatching().maxTokenLength(maxTokenLength));
         parsed.getMatchAlgorithm().ifPresent
             (matchingAlgorithm -> field.setMatchingAlgorithm(matchingAlgorithm));
         parsed.getExactTerminator().ifPresent
diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ParsedMatchSettings.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedMatchSettings.java
index c7d1a215ce3..bac2c894283 100644
--- a/config-model/src/main/java/com/yahoo/schema/parser/ParsedMatchSettings.java
+++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedMatchSettings.java
@@ -23,6 +23,7 @@ public class ParsedMatchSettings {
     private Integer gramSize = null;
     private Integer maxLength = null;
     private Integer maxTermOccurrences = null;
+    private Integer maxTokenLength = null;
 
     Optional<MatchType> getMatchType() { return Optional.ofNullable(matchType); }
     Optional<Case> getMatchCase() { return Optional.ofNullable(matchCase); }
@@ -31,6 +32,7 @@ public class ParsedMatchSettings {
     Optional<Integer> getGramSize() { return Optional.ofNullable(gramSize); }
     Optional<Integer> getMaxLength() { return Optional.ofNullable(maxLength); }
     Optional<Integer> getMaxTermOccurrences() { return Optional.ofNullable(maxTermOccurrences); }
+    Optional<Integer> getMaxTokenLength() { return Optional.ofNullable(maxTokenLength); }
 
     // TODO - consider allowing each set only once:
     void setType(MatchType value) { this.matchType = value; }
@@ -40,5 +42,6 @@ public class ParsedMatchSettings {
     void setGramSize(int value) { this.gramSize = value; }
     void setMaxLength(int value) { this.maxLength = value; }
     void setMaxTermOccurrences(int value) { this.maxTermOccurrences = value; }
+    void setMaxTokenLength(int value) { this.maxTokenLength = value; }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java b/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java
index 767593b82d0..769f0c9de92 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java
@@ -2,6 +2,7 @@
 package com.yahoo.schema.processing;
 
 import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.document.TensorDataType;
 import com.yahoo.schema.RankProfileRegistry;
 import com.yahoo.document.DataType;
 import com.yahoo.schema.Schema;
@@ -45,6 +46,8 @@ public class AttributesImplicitWord extends Processor {
     private boolean fieldImplicitlyWordMatch(ImmutableSDField field) {
         // numeric types should not trigger exact-match query parsing
         if (field.getDataType().getPrimitiveType() instanceof NumericDataType) return false;
+        // Tensor type should not trigger exact-match query parsing
+        if (field.getDataType() instanceof TensorDataType) return false;
 
         return (! field.hasIndex()
                 && !field.getAttributes().isEmpty()
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ExactMatch.java b/config-model/src/main/java/com/yahoo/schema/processing/ExactMatch.java
index 056c37a9830..4313ceb4be1 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/ExactMatch.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/ExactMatch.java
@@ -16,6 +16,7 @@ import com.yahoo.vespa.indexinglanguage.expressions.ForEachExpression;
 import com.yahoo.vespa.indexinglanguage.expressions.IndexExpression;
 import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression;
 import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression;
+import com.yahoo.vespa.indexinglanguage.linguistics.AnnotatorConfig;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
 /**
@@ -75,7 +76,11 @@ public class ExactMatch extends Processor {
         }
         ScriptExpression script = field.getIndexingScript();
         if (new ExpressionSearcher<>(IndexExpression.class).containedIn(script)) {
-            field.setIndexingScript(schema.getName(), (ScriptExpression)new MyProvider(schema).convert(field.getIndexingScript()));
+            var maxTokenLength = field.getMatching().maxTokenLength();
+            if (maxTokenLength == null) {
+                maxTokenLength = AnnotatorConfig.getDefaultMaxTokenLength();
+            }
+            field.setIndexingScript(schema.getName(), (ScriptExpression)new MyProvider(schema, maxTokenLength).convert(field.getIndexingScript()));
         }
     }
 
@@ -85,8 +90,12 @@ public class ExactMatch extends Processor {
 
     private static class MyProvider extends TypedTransformProvider {
 
-        MyProvider(Schema schema) {
+        private int maxTokenLength;
+
+        MyProvider(Schema schema, int maxTokenLength)
+        {
             super(ExactExpression.class, schema);
+            this.maxTokenLength = maxTokenLength;
         }
 
         @Override
@@ -96,7 +105,7 @@ public class ExactMatch extends Processor {
 
         @Override
         protected Expression newTransform(DataType fieldType) {
-            Expression exp = new ExactExpression();
+            Expression exp = new ExactExpression(maxTokenLength);
             if (fieldType instanceof CollectionDataType) {
                 exp = new ForEachExpression(exp);
             }
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/TextMatch.java b/config-model/src/main/java/com/yahoo/schema/processing/TextMatch.java
index e29f683761f..3f23cbc9b2d 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/TextMatch.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/TextMatch.java
@@ -64,12 +64,16 @@ public class TextMatch extends Processor {
         if (fieldMatching != null) {
             var maxLength = fieldMatching.maxLength();
             if (maxLength != null) {
-                ret.setMaxTokenLength(maxLength);
+                ret.setMaxTokenizeLength(maxLength);
             }
             var maxTermOccurrences = fieldMatching.maxTermOccurrences();
             if (maxTermOccurrences != null) {
                 ret.setMaxTermOccurrences(maxTermOccurrences);
             }
+            var maxTokenLength = fieldMatching.maxTokenLength();
+            if (maxTokenLength != null) {
+                ret.setMaxTokenLength(maxTokenLength);
+            }
         }
         return ret;
     }
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java b/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java
index 8ccc8870419..3d4934ed841 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java
@@ -29,6 +29,10 @@ public abstract class TypedTransformProvider extends ValueTransformProvider {
     protected final boolean requiresTransform(Expression exp) {
         if (exp instanceof OutputExpression) {
             String fieldName = ((OutputExpression)exp).getFieldName();
+            if (fieldName == null) {
+                // Incomplete output expressions never require a transform.
+                return false;
+            }
             if (exp instanceof AttributeExpression) {
                 Attribute attribute = schema.getAttribute(fieldName);
                 if (attribute == null)
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
index d50d5e36134..785b45d8def 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
@@ -3,10 +3,12 @@ package com.yahoo.vespa.documentmodel;
 
 import com.yahoo.document.DataType;
 import com.yahoo.document.Field;
-import com.yahoo.schema.document.TypedKey;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.yahoo.text.Lowercase.toLowerCase;
@@ -16,7 +18,7 @@ import static com.yahoo.text.Lowercase.toLowerCase;
  *
  * @author bratseth
  */
-public class SummaryField extends Field implements Cloneable, TypedKey {
+public class SummaryField extends Field implements Cloneable {
 
     /** A source (field name). */
     public static class Source implements Serializable {
@@ -62,7 +64,7 @@ public class SummaryField extends Field implements Cloneable, TypedKey {
      */
     private Set<Source> sources = new java.util.LinkedHashSet<>();
 
-    private Set<String> destinations  =new java.util.LinkedHashSet<>();
+    private Set<String> destinations  = new java.util.LinkedHashSet<>();
 
     /** True if this field was defined implicitly */
     private boolean implicit = false;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java
index 40c9a03b126..02a6b243054 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java
@@ -132,7 +132,7 @@ public class ConstantTensorJsonValidator {
     private void consumeTopObject() throws IOException {
         for (var cur = parser.nextToken(); cur != JsonToken.END_OBJECT; cur = parser.nextToken()) {
             assertCurrentTokenIs(JsonToken.FIELD_NAME);
-            String fieldName = parser.getCurrentName();
+            String fieldName = parser.currentName();
             switch (fieldName) {
                 case FIELD_TYPE -> consumeTypeField();
                 case FIELD_VALUES -> consumeValuesField();
@@ -189,7 +189,7 @@ public class ConstantTensorJsonValidator {
         }
         for (var cur = parser.nextToken(); cur != JsonToken.END_OBJECT; cur = parser.nextToken()) {
             assertCurrentTokenIs(JsonToken.FIELD_NAME);
-            validateNumeric(parser.getCurrentName(), parser.nextToken());
+            validateNumeric(parser.currentName(), parser.nextToken());
         }
     }
 
@@ -199,7 +199,7 @@ public class ConstantTensorJsonValidator {
         boolean seenValue = false;
         for (int i = 0; i < 2; i++) {
             assertNextTokenIs(JsonToken.FIELD_NAME);
-            String fieldName = parser.getCurrentName();
+            String fieldName = parser.currentName();
             switch (fieldName) {
                 case FIELD_ADDRESS -> {
                     validateTensorAddress(new HashSet<>(tensorDimensions.keySet()));
@@ -228,13 +228,13 @@ public class ConstantTensorJsonValidator {
         // Iterate within the address key, value pairs
         while ((parser.nextToken() != JsonToken.END_OBJECT)) {
             assertCurrentTokenIs(JsonToken.FIELD_NAME);
-            String dimensionName = parser.getCurrentName();
+            String dimensionName = parser.currentName();
             TensorType.Dimension dimension = tensorDimensions.get(dimensionName);
             if (dimension == null) {
-                throw new InvalidConstantTensorException(parser, String.format("Tensor dimension '%s' does not exist", parser.getCurrentName()));
+                throw new InvalidConstantTensorException(parser, String.format("Tensor dimension '%s' does not exist", dimensionName));
             }
             if (!cellDimensions.contains(dimensionName)) {
-                throw new InvalidConstantTensorException(parser, String.format("Duplicate tensor dimension '%s'", parser.getCurrentName()));
+                throw new InvalidConstantTensorException(parser, String.format("Duplicate tensor dimension '%s'", dimensionName));
             }
             cellDimensions.remove(dimensionName);
             validateLabel(dimension);
@@ -300,7 +300,7 @@ public class ConstantTensorJsonValidator {
     }
 
     private void assertCurrentTokenIs(JsonToken wantedToken) {
-        assertTokenIs(parser.getCurrentToken(), wantedToken);
+        assertTokenIs(parser.currentToken(), wantedToken);
     }
 
     private void assertNextTokenIs(JsonToken wantedToken) throws IOException {
@@ -316,11 +316,11 @@ public class ConstantTensorJsonValidator {
     static class InvalidConstantTensorException extends IllegalArgumentException {
 
         InvalidConstantTensorException(JsonParser parser, String message) {
-            super(message + " " + parser.getCurrentLocation().toString());
+            super(message + " " + parser.currentLocation().toString());
         }
 
         InvalidConstantTensorException(JsonParser parser, Exception base) {
-            super("Failed to parse JSON stream " + parser.getCurrentLocation().toString(), base);
+            super("Failed to parse JSON stream " + parser.currentLocation().toString(), base);
         }
 
         InvalidConstantTensorException(IOException base) {
@@ -412,7 +412,7 @@ public class ConstantTensorJsonValidator {
             boolean seenValues = false;
             for (int i = 0; i < 2; i++) {
                 assertNextTokenIs(JsonToken.FIELD_NAME);
-                String fieldName = parser.getCurrentName();
+                String fieldName = parser.currentName();
                 switch (fieldName) {
                     case FIELD_ADDRESS -> {
                         validateTensorAddress(new HashSet<>(mappedDims));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java
index ed0804f7420..7f624032627 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java
@@ -19,6 +19,7 @@ import com.yahoo.vespa.model.application.validation.change.IndexingModeChangeVal
 import com.yahoo.vespa.model.application.validation.change.NodeResourceChangeValidator;
 import com.yahoo.vespa.model.application.validation.change.RedundancyIncreaseValidator;
 import com.yahoo.vespa.model.application.validation.change.ResourcesReductionValidator;
+import com.yahoo.vespa.model.application.validation.change.RestartOnDeployForLocalLLMValidator;
 import com.yahoo.vespa.model.application.validation.change.RestartOnDeployForOnnxModelChangesValidator;
 import com.yahoo.vespa.model.application.validation.change.StartupCommandChangeValidator;
 import com.yahoo.vespa.model.application.validation.change.StreamingSearchClusterChangeValidator;
@@ -129,6 +130,7 @@ public class Validation {
         new CertificateRemovalChangeValidator().validate(execution);
         new RedundancyValidator().validate(execution);
         new RestartOnDeployForOnnxModelChangesValidator().validate(execution);
+        new RestartOnDeployForLocalLLMValidator().validate(execution);
     }
 
     public interface Context {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForLocalLLMValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForLocalLLMValidator.java
new file mode 100644
index 00000000000..ccfc611c3dc
--- /dev/null
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForLocalLLMValidator.java
@@ -0,0 +1,55 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.model.application.validation.change;
+
+import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.vespa.model.VespaModel;
+import com.yahoo.vespa.model.application.validation.Validation.ChangeContext;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import static java.util.logging.Level.INFO;
+import static java.util.stream.Collectors.toUnmodifiableSet;
+
+/**
+ * If using local LLMs, this validator will make sure that restartOnDeploy is set for
+ * configs for this cluster.
+ *
+ * @author lesters
+ */
+public class RestartOnDeployForLocalLLMValidator implements ChangeValidator {
+
+    public static final String LOCAL_LLM_COMPONENT = ai.vespa.llm.clients.LocalLLM.class.getName();
+
+    private static final Logger log = Logger.getLogger(RestartOnDeployForLocalLLMValidator.class.getName());
+
+    @Override
+    public void validate(ChangeContext context) {
+        var previousClustersWithLocalLLM = findClustersWithLocalLLMs(context.previousModel());
+        var nextClustersWithLocalLLM = findClustersWithLocalLLMs(context.model());
+
+        // Only restart services if we use a local LLM in both the next and previous generation
+        for (var clusterId : intersect(previousClustersWithLocalLLM, nextClustersWithLocalLLM)) {
+            String message = "Need to restart services in %s due to use of local LLM".formatted(clusterId);
+            context.require(new VespaRestartAction(clusterId, message));
+            log.log(INFO, message);
+        }
+    }
+
+    private Set<ClusterSpec.Id> findClustersWithLocalLLMs(VespaModel model) {
+        return model.getContainerClusters().values().stream()
+                .filter(cluster -> cluster.getAllComponents().stream()
+                    .anyMatch(component -> component.getClassId().getName().equals(LOCAL_LLM_COMPONENT)))
+                .map(ApplicationContainerCluster::id)
+                .collect(toUnmodifiableSet());
+    }
+
+    private Set<ClusterSpec.Id> intersect(Set<ClusterSpec.Id> a, Set<ClusterSpec.Id> b) {
+        Set<ClusterSpec.Id> result = new HashSet<>(a);
+        result.retainAll(b);
+        return result;
+    }
+
+}
diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj
index b40f2d0796d..1365c133932 100644
--- a/config-model/src/main/javacc/SchemaParser.jj
+++ b/config-model/src/main/javacc/SchemaParser.jj
@@ -183,6 +183,7 @@ TOKEN :
 | < GRAM_SIZE: "gram-size" >
 | < MAX_LENGTH: "max-length" >
 | < MAX_OCCURRENCES: "max-occurrences" >
+| < MAX_TOKEN_LENGTH: "max-token-length" >
 | < PREFIX: "prefix" >
 | < SUBSTRING: "substring" >
 | < SUFFIX: "suffix" >
@@ -1368,7 +1369,8 @@ void matchType(ParsedMatchSettings matchInfo) : { }
  */
 void matchItem(ParsedMatchSettings matchInfo) : { }
 {
-    ( matchType(matchInfo) | exactTerminator(matchInfo) | gramSize(matchInfo) | matchSize(matchInfo) | maxTermOccurrences(matchInfo))
+    ( matchType(matchInfo) | exactTerminator(matchInfo) | gramSize(matchInfo) | matchSize(matchInfo) |
+     maxTermOccurrences(matchInfo) | maxTokenLength(matchInfo) )
 }
 
 void exactTerminator(ParsedMatchSettings matchInfo) :
@@ -1413,6 +1415,16 @@ void maxTermOccurrences(ParsedMatchSettings matchInfo) :
     }
 }
 
+void maxTokenLength(ParsedMatchSettings matchInfo) :
+{
+    int maxTokenLength;
+}
+{
+    <MAX_TOKEN_LENGTH> <COLON> maxTokenLength = integer() {
+        matchInfo.setMaxTokenLength(maxTokenLength);
+    }
+}
+
 /**
  * Consumes a rank statement of a field element.
  *
diff --git a/config-model/src/test/derived/advanced/ilscripts.cfg b/config-model/src/test/derived/advanced/ilscripts.cfg
index 51a49502b64..d633cd97f0c 100644
--- a/config-model/src/test/derived/advanced/ilscripts.cfg
+++ b/config-model/src/test/derived/advanced/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "advanced"
 ilscript[].docfield[] "debug_src"
diff --git a/config-model/src/test/derived/annotationsimplicitstruct/ilscripts.cfg b/config-model/src/test/derived/annotationsimplicitstruct/ilscripts.cfg
index 767c3af3c19..53dc789fbb7 100644
--- a/config-model/src/test/derived/annotationsimplicitstruct/ilscripts.cfg
+++ b/config-model/src/test/derived/annotationsimplicitstruct/ilscripts.cfg
@@ -1,3 +1,4 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "annotationsimplicitstruct"
diff --git a/config-model/src/test/derived/annotationsinheritance/ilscripts.cfg b/config-model/src/test/derived/annotationsinheritance/ilscripts.cfg
index d8e6c882b80..b0a69c5408a 100644
--- a/config-model/src/test/derived/annotationsinheritance/ilscripts.cfg
+++ b/config-model/src/test/derived/annotationsinheritance/ilscripts.cfg
@@ -1,3 +1,4 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "annotationsinheritance"
diff --git a/config-model/src/test/derived/annotationsinheritance2/ilscripts.cfg b/config-model/src/test/derived/annotationsinheritance2/ilscripts.cfg
index ae4ea621583..5ec1f839429 100644
--- a/config-model/src/test/derived/annotationsinheritance2/ilscripts.cfg
+++ b/config-model/src/test/derived/annotationsinheritance2/ilscripts.cfg
@@ -1,3 +1,4 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "annotationsinheritance2"
diff --git a/config-model/src/test/derived/annotationsreference/ilscripts.cfg b/config-model/src/test/derived/annotationsreference/ilscripts.cfg
index 812f5e44545..eaa20043be8 100644
--- a/config-model/src/test/derived/annotationsreference/ilscripts.cfg
+++ b/config-model/src/test/derived/annotationsreference/ilscripts.cfg
@@ -1,3 +1,4 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "annotationsreference"
diff --git a/config-model/src/test/derived/annotationssimple/ilscripts.cfg b/config-model/src/test/derived/annotationssimple/ilscripts.cfg
index 9d0962df5be..af179221eb4 100644
--- a/config-model/src/test/derived/annotationssimple/ilscripts.cfg
+++ b/config-model/src/test/derived/annotationssimple/ilscripts.cfg
@@ -1,3 +1,4 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "annotationssimple"
diff --git a/config-model/src/test/derived/arrays/ilscripts.cfg b/config-model/src/test/derived/arrays/ilscripts.cfg
index 98cff642d9e..3f2dae48552 100644
--- a/config-model/src/test/derived/arrays/ilscripts.cfg
+++ b/config-model/src/test/derived/arrays/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "arrays"
 ilscript[].docfield[] "tags"
diff --git a/config-model/src/test/derived/attributeprefetch/ilscripts.cfg b/config-model/src/test/derived/attributeprefetch/ilscripts.cfg
index dec054b33f0..5a3784f7cb9 100644
--- a/config-model/src/test/derived/attributeprefetch/ilscripts.cfg
+++ b/config-model/src/test/derived/attributeprefetch/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "prefetch"
 ilscript[].docfield[] "singlebyte"
diff --git a/config-model/src/test/derived/attributes/ilscripts.cfg b/config-model/src/test/derived/attributes/ilscripts.cfg
index 6d3ef2799d9..58279759e5f 100644
--- a/config-model/src/test/derived/attributes/ilscripts.cfg
+++ b/config-model/src/test/derived/attributes/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "attributes"
 ilscript[].docfield[] "a1"
diff --git a/config-model/src/test/derived/attributes/index-info.cfg b/config-model/src/test/derived/attributes/index-info.cfg
index 1d4e8f485b3..245cff48d15 100644
--- a/config-model/src/test/derived/attributes/index-info.cfg
+++ b/config-model/src/test/derived/attributes/index-info.cfg
@@ -175,8 +175,6 @@ indexinfo[].command[].indexname "a13"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "a13"
 indexinfo[].command[].command "type tensor(x{})"
-indexinfo[].command[].indexname "a13"
-indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "a7_arr"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "a7_arr"
diff --git a/config-model/src/test/derived/bolding_dynamic_summary/ilscripts.cfg b/config-model/src/test/derived/bolding_dynamic_summary/ilscripts.cfg
index c20c321ebcf..0b925da4778 100644
--- a/config-model/src/test/derived/bolding_dynamic_summary/ilscripts.cfg
+++ b/config-model/src/test/derived/bolding_dynamic_summary/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "test"
 ilscript[].docfield[] "str_1"
diff --git a/config-model/src/test/derived/complex/ilscripts.cfg b/config-model/src/test/derived/complex/ilscripts.cfg
index 4405d2fda40..7d025e15703 100644
--- a/config-model/src/test/derived/complex/ilscripts.cfg
+++ b/config-model/src/test/derived/complex/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "complex"
 ilscript[].docfield[] "title"
diff --git a/config-model/src/test/derived/emptydefault/ilscripts.cfg b/config-model/src/test/derived/emptydefault/ilscripts.cfg
index e4242153bce..bbb8e5c556c 100644
--- a/config-model/src/test/derived/emptydefault/ilscripts.cfg
+++ b/config-model/src/test/derived/emptydefault/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "emptydefault"
 ilscript[].docfield[] "one"
diff --git a/config-model/src/test/derived/exactmatch/ilscripts.cfg b/config-model/src/test/derived/exactmatch/ilscripts.cfg
index 21dfbd1371b..1d1bd6d5e8a 100644
--- a/config-model/src/test/derived/exactmatch/ilscripts.cfg
+++ b/config-model/src/test/derived/exactmatch/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "exactmatch"
 ilscript[].docfield[] "tag"
diff --git a/config-model/src/test/derived/hnsw_index/ilscripts.cfg b/config-model/src/test/derived/hnsw_index/ilscripts.cfg
index e48f116f468..c811b93c3df 100644
--- a/config-model/src/test/derived/hnsw_index/ilscripts.cfg
+++ b/config-model/src/test/derived/hnsw_index/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "test"
 ilscript[].docfield[] "t1"
diff --git a/config-model/src/test/derived/id/ilscripts.cfg b/config-model/src/test/derived/id/ilscripts.cfg
index d3ab29f6cd8..121e305059e 100644
--- a/config-model/src/test/derived/id/ilscripts.cfg
+++ b/config-model/src/test/derived/id/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "id"
 ilscript[].docfield[] "uri"
diff --git a/config-model/src/test/derived/imported_position_field_summary/schema-info.cfg b/config-model/src/test/derived/imported_position_field_summary/schema-info.cfg
index f820ad9720b..5a474f62e07 100644
--- a/config-model/src/test/derived/imported_position_field_summary/schema-info.cfg
+++ b/config-model/src/test/derived/imported_position_field_summary/schema-info.cfg
@@ -53,6 +53,8 @@ schema[].summaryclass[].fields[].dynamic false
 schema[].rankprofile[].name "default"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "unranked"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
diff --git a/config-model/src/test/derived/indexswitches/ilscripts.cfg b/config-model/src/test/derived/indexswitches/ilscripts.cfg
index 472c1f95cb0..454f675c0a2 100644
--- a/config-model/src/test/derived/indexswitches/ilscripts.cfg
+++ b/config-model/src/test/derived/indexswitches/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "indexswitches"
 ilscript[].docfield[] "title"
diff --git a/config-model/src/test/derived/inheritance/ilscripts.cfg b/config-model/src/test/derived/inheritance/ilscripts.cfg
index d4c804773f0..c966f32a502 100644
--- a/config-model/src/test/derived/inheritance/ilscripts.cfg
+++ b/config-model/src/test/derived/inheritance/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "child"
 ilscript[].docfield[] "onlygrandparent"
diff --git a/config-model/src/test/derived/language/ilscripts.cfg b/config-model/src/test/derived/language/ilscripts.cfg
index 1860f180839..d0abc08f1e0 100644
--- a/config-model/src/test/derived/language/ilscripts.cfg
+++ b/config-model/src/test/derived/language/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "language"
 ilscript[].docfield[] "language"
diff --git a/config-model/src/test/derived/lowercase/ilscripts.cfg b/config-model/src/test/derived/lowercase/ilscripts.cfg
index 8ba4bfa3349..49515e50df4 100644
--- a/config-model/src/test/derived/lowercase/ilscripts.cfg
+++ b/config-model/src/test/derived/lowercase/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "lowercase"
 ilscript[].docfield[] "single_field_source"
diff --git a/config-model/src/test/derived/multiplesummaries/ilscripts.cfg b/config-model/src/test/derived/multiplesummaries/ilscripts.cfg
index 0cdf921de25..4a6de4154f8 100644
--- a/config-model/src/test/derived/multiplesummaries/ilscripts.cfg
+++ b/config-model/src/test/derived/multiplesummaries/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "multiplesummaries"
 ilscript[].docfield[] "a"
diff --git a/config-model/src/test/derived/music/ilscripts.cfg b/config-model/src/test/derived/music/ilscripts.cfg
index f90cdb15baa..f79e8824b69 100644
--- a/config-model/src/test/derived/music/ilscripts.cfg
+++ b/config-model/src/test/derived/music/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "music"
 ilscript[].docfield[] "bgndata"
diff --git a/config-model/src/test/derived/nearestneighbor_streaming/vsmfields.cfg b/config-model/src/test/derived/nearestneighbor_streaming/vsmfields.cfg
index ab9a96f819b..ec06d01f05a 100644
--- a/config-model/src/test/derived/nearestneighbor_streaming/vsmfields.cfg
+++ b/config-model/src/test/derived/nearestneighbor_streaming/vsmfields.cfg
@@ -3,25 +3,25 @@ searchall 1
 fieldspec[].name "vec_a"
 fieldspec[].searchmethod NEAREST_NEIGHBOR
 fieldspec[].arg1 "EUCLIDEAN"
-fieldspec[].normalize LOWERCASE
+fieldspec[].normalize LOWERCASE_AND_FOLD
 fieldspec[].maxlength 1048576
 fieldspec[].fieldtype ATTRIBUTE
 fieldspec[].name "vec_b"
 fieldspec[].searchmethod NEAREST_NEIGHBOR
 fieldspec[].arg1 "ANGULAR"
-fieldspec[].normalize LOWERCASE
+fieldspec[].normalize LOWERCASE_AND_FOLD
 fieldspec[].maxlength 1048576
 fieldspec[].fieldtype ATTRIBUTE
 fieldspec[].name "vec_c"
 fieldspec[].searchmethod NEAREST_NEIGHBOR
 fieldspec[].arg1 "INNERPRODUCT"
-fieldspec[].normalize LOWERCASE
+fieldspec[].normalize LOWERCASE_AND_FOLD
 fieldspec[].maxlength 1048576
 fieldspec[].fieldtype ATTRIBUTE
 fieldspec[].name "vec_d"
 fieldspec[].searchmethod NONE
 fieldspec[].arg1 ""
-fieldspec[].normalize LOWERCASE
+fieldspec[].normalize LOWERCASE_AND_FOLD
 fieldspec[].maxlength 1048576
 fieldspec[].fieldtype ATTRIBUTE
 documenttype[].name "test"
diff --git a/config-model/src/test/derived/neuralnet_noqueryprofile/schema-info.cfg b/config-model/src/test/derived/neuralnet_noqueryprofile/schema-info.cfg
index 728856abbf2..8f59c21e97f 100644
--- a/config-model/src/test/derived/neuralnet_noqueryprofile/schema-info.cfg
+++ b/config-model/src/test/derived/neuralnet_noqueryprofile/schema-info.cfg
@@ -156,6 +156,7 @@ schema[].summaryclass[].fields[].dynamic false
 schema[].rankprofile[].name "default"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].input[].name "query(W_0)"
 schema[].rankprofile[].input[].type "tensor(hidden[9],x[9])"
 schema[].rankprofile[].input[].name "query(b_0)"
@@ -173,9 +174,11 @@ schema[].rankprofile[].input[].type "tensor()"
 schema[].rankprofile[].name "unranked"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "defaultRankProfile"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].input[].name "query(W_0)"
 schema[].rankprofile[].input[].type "tensor(hidden[9],x[9])"
 schema[].rankprofile[].input[].name "query(b_0)"
@@ -193,6 +196,7 @@ schema[].rankprofile[].input[].type "tensor()"
 schema[].rankprofile[].name "neuralNetworkProfile"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].input[].name "query(W_0)"
 schema[].rankprofile[].input[].type "tensor(hidden[9],x[9])"
 schema[].rankprofile[].input[].name "query(b_0)"
diff --git a/config-model/src/test/derived/newrank/ilscripts.cfg b/config-model/src/test/derived/newrank/ilscripts.cfg
index b02e09a0496..487d2fca902 100644
--- a/config-model/src/test/derived/newrank/ilscripts.cfg
+++ b/config-model/src/test/derived/newrank/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "newrank"
 ilscript[].docfield[] "bgndata"
diff --git a/config-model/src/test/derived/orderilscripts/ilscripts.cfg b/config-model/src/test/derived/orderilscripts/ilscripts.cfg
index 0ed1589af0a..4918e23efc6 100644
--- a/config-model/src/test/derived/orderilscripts/ilscripts.cfg
+++ b/config-model/src/test/derived/orderilscripts/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "orderilscripts"
 ilscript[].docfield[] "foo"
diff --git a/config-model/src/test/derived/position_array/ilscripts.cfg b/config-model/src/test/derived/position_array/ilscripts.cfg
index ecafbc4a025..3f7611b25d8 100644
--- a/config-model/src/test/derived/position_array/ilscripts.cfg
+++ b/config-model/src/test/derived/position_array/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "position_array"
 ilscript[].docfield[] "pos"
diff --git a/config-model/src/test/derived/position_attribute/ilscripts.cfg b/config-model/src/test/derived/position_attribute/ilscripts.cfg
index d2fc8503ce5..fbd1a293418 100644
--- a/config-model/src/test/derived/position_attribute/ilscripts.cfg
+++ b/config-model/src/test/derived/position_attribute/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "position_attribute"
 ilscript[].docfield[] "pos"
diff --git a/config-model/src/test/derived/position_extra/ilscripts.cfg b/config-model/src/test/derived/position_extra/ilscripts.cfg
index a86dcec92ec..4645798723c 100644
--- a/config-model/src/test/derived/position_extra/ilscripts.cfg
+++ b/config-model/src/test/derived/position_extra/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "position_extra"
 ilscript[].docfield[] "pos_str"
diff --git a/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg b/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg
index 40c7843a0a4..2d1904cf9d8 100644
--- a/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "prefixexactattribute"
 ilscript[].docfield[] "indexfield0"
diff --git a/config-model/src/test/derived/rankingexpression/schema-info.cfg b/config-model/src/test/derived/rankingexpression/schema-info.cfg
index 5bf01f10ede..f78eb7de310 100644
--- a/config-model/src/test/derived/rankingexpression/schema-info.cfg
+++ b/config-model/src/test/derived/rankingexpression/schema-info.cfg
@@ -148,96 +148,125 @@ schema[].summaryclass[].fields[].dynamic false
 schema[].rankprofile[].name "default"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures true
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "unranked"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "static"
 schema[].rankprofile[].hasSummaryFeatures true
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "overflow"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "duplicates"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "whitespace1"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "whitespace2"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros"
 schema[].rankprofile[].hasSummaryFeatures true
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros2"
 schema[].rankprofile[].hasSummaryFeatures true
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros3"
 schema[].rankprofile[].hasSummaryFeatures true
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros3-inherited"
 schema[].rankprofile[].hasSummaryFeatures true
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros-inherited"
 schema[].rankprofile[].hasSummaryFeatures true
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros-inherited2"
 schema[].rankprofile[].hasSummaryFeatures true
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros-inherited3"
 schema[].rankprofile[].hasSummaryFeatures true
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros-refering-macros"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros-refering-macros-inherited"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros-refering-macros-inherited2"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "macros-refering-macros-inherited-two-levels"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "withmf"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "withboolean"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "withglobalphase"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "layered"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].input[].name "query(v)"
 schema[].rankprofile[].input[].type "tensor(v[3])"
 schema[].rankprofile[].name "withtfl"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].input[].name "query(v)"
 schema[].rankprofile[].input[].type "tensor(v[3])"
 schema[].rankprofile[].name "withtfl2"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].input[].name "query(v)"
 schema[].rankprofile[].input[].type "tensor(v[3])"
 schema[].rankprofile[].name "withnorm"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "withfusion"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "function-with-arg-as-summary-feature"
 schema[].rankprofile[].hasSummaryFeatures true
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "function-with-arg-in-global-phase"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "withstringcompare"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].input[].name "query(myquerystring)"
 schema[].rankprofile[].input[].type "string"
 schema[].rankprofile[].input[].name "query(mybadlong)"
diff --git a/config-model/src/test/derived/rankprofilemodularity/schema-info.cfg b/config-model/src/test/derived/rankprofilemodularity/schema-info.cfg
index 377c10d3293..68892737e63 100644
--- a/config-model/src/test/derived/rankprofilemodularity/schema-info.cfg
+++ b/config-model/src/test/derived/rankprofilemodularity/schema-info.cfg
@@ -18,24 +18,32 @@ schema[].summaryclass[].fields[].dynamic false
 schema[].rankprofile[].name "default"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "unranked"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "in_schema0"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "in_schema1"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "in_schema2"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "in_schema3"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "outside_schema1"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "outside_schema2"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
diff --git a/config-model/src/test/derived/ranktypes/ilscripts.cfg b/config-model/src/test/derived/ranktypes/ilscripts.cfg
index adcd2f70c70..22526d1aa23 100644
--- a/config-model/src/test/derived/ranktypes/ilscripts.cfg
+++ b/config-model/src/test/derived/ranktypes/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "ranktypes"
 ilscript[].docfield[] "title"
diff --git a/config-model/src/test/derived/schemainheritance/ilscripts.cfg b/config-model/src/test/derived/schemainheritance/ilscripts.cfg
index f7324920fe7..b1ba947f1dc 100644
--- a/config-model/src/test/derived/schemainheritance/ilscripts.cfg
+++ b/config-model/src/test/derived/schemainheritance/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "child"
 ilscript[].docfield[] "pf1"
diff --git a/config-model/src/test/derived/schemainheritance/schema-info.cfg b/config-model/src/test/derived/schemainheritance/schema-info.cfg
index 9fe71780c7a..466e66ad0bb 100644
--- a/config-model/src/test/derived/schemainheritance/schema-info.cfg
+++ b/config-model/src/test/derived/schemainheritance/schema-info.cfg
@@ -116,12 +116,16 @@ schema[].summaryclass[].fields[].dynamic false
 schema[].rankprofile[].name "default"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "unranked"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "child_profile"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
 schema[].rankprofile[].name "parent_profile"
 schema[].rankprofile[].hasSummaryFeatures false
 schema[].rankprofile[].hasRankFeatures false
+schema[].rankprofile[].significance.useModel false
diff --git a/config-model/src/test/derived/structanyorder/ilscripts.cfg b/config-model/src/test/derived/structanyorder/ilscripts.cfg
index c07f04b3021..a806bc1b712 100644
--- a/config-model/src/test/derived/structanyorder/ilscripts.cfg
+++ b/config-model/src/test/derived/structanyorder/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "annotationsimplicitstruct"
 ilscript[].docfield[] "structfield"
diff --git a/config-model/src/test/derived/tensor/index-info.cfg b/config-model/src/test/derived/tensor/index-info.cfg
index c9ce2433e17..2402f074837 100644
--- a/config-model/src/test/derived/tensor/index-info.cfg
+++ b/config-model/src/test/derived/tensor/index-info.cfg
@@ -9,26 +9,18 @@ indexinfo[].command[].indexname "f2"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "f2"
 indexinfo[].command[].command "type tensor<float>(x[2],y[1])"
-indexinfo[].command[].indexname "f2"
-indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "f3"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "f3"
 indexinfo[].command[].command "type tensor(x{})"
-indexinfo[].command[].indexname "f3"
-indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "f4"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "f4"
 indexinfo[].command[].command "type tensor(x[10],y[10])"
-indexinfo[].command[].indexname "f4"
-indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "f5"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "f5"
 indexinfo[].command[].command "type tensor<float>(x[10])"
-indexinfo[].command[].indexname "f5"
-indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "f6"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "f6"
@@ -39,5 +31,3 @@ indexinfo[].command[].indexname "f7"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "f7"
 indexinfo[].command[].command "type tensor<int8>(p{},x[5])"
-indexinfo[].command[].indexname "f7"
-indexinfo[].command[].command "word"
diff --git a/config-model/src/test/derived/tokenization/ilscripts.cfg b/config-model/src/test/derived/tokenization/ilscripts.cfg
index c08b6a54c83..cad8ec81879 100644
--- a/config-model/src/test/derived/tokenization/ilscripts.cfg
+++ b/config-model/src/test/derived/tokenization/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "tokenization"
 ilscript[].docfield[] "text"
diff --git a/config-model/src/test/derived/types/ilscripts.cfg b/config-model/src/test/derived/types/ilscripts.cfg
index 17bed90deb4..73befb221ce 100644
--- a/config-model/src/test/derived/types/ilscripts.cfg
+++ b/config-model/src/test/derived/types/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "types"
 ilscript[].docfield[] "abyte"
diff --git a/config-model/src/test/derived/uri_array/ilscripts.cfg b/config-model/src/test/derived/uri_array/ilscripts.cfg
index 3dd97e5c11f..0dc87b513ce 100644
--- a/config-model/src/test/derived/uri_array/ilscripts.cfg
+++ b/config-model/src/test/derived/uri_array/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "uri_array"
 ilscript[].docfield[] "my_uri"
diff --git a/config-model/src/test/derived/uri_wset/ilscripts.cfg b/config-model/src/test/derived/uri_wset/ilscripts.cfg
index 48e07ef9959..cc45ee5ad8f 100644
--- a/config-model/src/test/derived/uri_wset/ilscripts.cfg
+++ b/config-model/src/test/derived/uri_wset/ilscripts.cfg
@@ -1,4 +1,5 @@
 maxtermoccurrences 10000
+maxtokenlength 1000
 fieldmatchmaxlength 1000000
 ilscript[].doctype "uri_wset"
 ilscript[].docfield[] "my_uri"
diff --git a/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
index 34ca6c30a61..4186e352388 100644
--- a/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
@@ -170,6 +170,23 @@ public class SchemaParserTestCase {
         assertEquals(11, field.matchSettings().getMaxTermOccurrences().get());
     }
 
+    @Test
+    void maxTokenLengthCanBeParsed() throws Exception {
+        String input = joinLines
+                ("schema foo {",
+                        "  document foo {",
+                        "    field bar type string {",
+                        "      indexing: summary | index",
+                        "      match { max-token-length: 11 }",
+                        "    }",
+                        "  }",
+                        "}");
+        ParsedSchema schema = parseString(input);
+        var field = schema.getDocument().getFields().get(0);
+        assertEquals("bar", field.name());
+        assertEquals(11, field.matchSettings().getMaxTokenLength().get());
+    }
+
     void checkFileParses(String fileName) throws Exception {
         var schema = parseFile(fileName);
         assertNotNull(schema);
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java
index de99d46b9ca..355a810f5ff 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java
@@ -10,6 +10,7 @@ import com.yahoo.schema.Schema;
 import com.yahoo.schema.ApplicationBuilder;
 import com.yahoo.schema.AbstractSchemaTestCase;
 import com.yahoo.schema.document.BooleanIndexDefinition;
+import com.yahoo.schema.document.MatchType;
 import com.yahoo.schema.document.SDDocumentType;
 import com.yahoo.schema.document.SDField;
 import com.yahoo.vespa.documentmodel.SummaryField;
@@ -155,6 +156,24 @@ public class IndexingScriptRewriterTestCase extends AbstractSchemaTestCase {
                 field);
     }
 
+    @Test
+    void requireThatMaxTokenLengthIsPropagated() {
+        var field = new SDField("test", DataType.STRING);
+        field.getMatching().maxTokenLength(10);
+        field.parseIndexingScript("test", "{ summary | index }");
+        assertIndexingScript("{ input test | tokenize normalize stem:\"BEST\" max-token-length:10 | summary test | index test; }",
+                field);
+    }
+
+    @Test
+    void requireThatMaxTokenLengthIsPropagatedForWordMatch() {
+        var field = new SDField("test", DataType.STRING);
+        field.getMatching().maxTokenLength(10).setType(MatchType.WORD);
+        field.parseIndexingScript("test", "{ summary | index }");
+        assertIndexingScript("{ input test | exact max-token-length:10 | summary test | index test; }",
+                field);
+    }
+
     private static void assertIndexingScript(String expectedScript, SDField unprocessedField) {
         assertEquals(expectedScript,
                 processField(unprocessedField).toString());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexFieldsValidatorTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexFieldsValidatorTestCase.java
index ae1db366c9f..2e51a425f6d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexFieldsValidatorTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexFieldsValidatorTestCase.java
@@ -143,6 +143,32 @@ public class ComplexFieldsValidatorTestCase {
     }
 
     @Test
+    void logs_warning_when_complex_fields_have_struct_fields_with_index_and_exact_match() throws IOException, SAXException {
+        var logger = new MyLogger();
+        createModelAndValidate(joinLines(
+                "schema test {",
+                "  document test {",
+                "    field nesteds type array<nested> {",
+                "      struct-field foo {",
+                "        indexing: attribute | index",
+                "        match {",
+                "          exact",
+                "          exact-terminator: '@@'",
+                "        }",
+                "      }",
+                "    }",
+                "    struct nested {",
+                "      field foo type string {}",
+                "    }",
+                "  }",
+                "}"), logger);
+        assertTrue(logger.message.toString().contains("For cluster 'mycluster', schema 'test': " +
+                "The following complex fields have struct fields with 'indexing: index' which is " +
+                "not supported and has no effect: nesteds (nesteds.foo). " +
+                "Remove setting or change to 'indexing: attribute' if needed for matching."));
+    }
+
+    @Test
     void validation_passes_when_only_supported_struct_field_attributes_are_used() throws IOException, SAXException {
         createModelAndValidate(joinLines("search test {",
                 "  document test {",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForLocalLLMValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForLocalLLMValidatorTest.java
new file mode 100644
index 00000000000..13e91f60712
--- /dev/null
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForLocalLLMValidatorTest.java
@@ -0,0 +1,79 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.model.application.validation.change;
+
+import com.yahoo.config.model.api.ConfigChangeAction;
+import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.config.model.deploy.TestProperties;
+import com.yahoo.vespa.model.VespaModel;
+import com.yahoo.vespa.model.application.validation.ValidationTester;
+import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author lesters
+ */
+public class RestartOnDeployForLocalLLMValidatorTest {
+
+    private static final String LOCAL_LLM_COMPONENT = RestartOnDeployForLocalLLMValidator.LOCAL_LLM_COMPONENT;
+
+    @Test
+    void validate_no_restart_on_deploy() {
+        VespaModel current = createModel();
+        VespaModel next = createModel(withComponent(LOCAL_LLM_COMPONENT));
+        List<ConfigChangeAction> result = validateModel(current, next);
+        assertEquals(0, result.size());
+    }
+
+    @Test
+    void validate_restart_on_deploy() {
+        VespaModel current = createModel(withComponent(LOCAL_LLM_COMPONENT));
+        VespaModel next = createModel(withComponent(LOCAL_LLM_COMPONENT));
+        List<ConfigChangeAction> result = validateModel(current, next);
+        assertEquals(1, result.size());
+        assertTrue(result.get(0).validationId().isEmpty());
+        assertEquals("Need to restart services in cluster 'cluster1' due to use of local LLM", result.get(0).getMessage());
+    }
+
+    private static List<ConfigChangeAction> validateModel(VespaModel current, VespaModel next) {
+        return ValidationTester.validateChanges(new RestartOnDeployForLocalLLMValidator(),
+                                                next,
+                                                deployStateBuilder().previousModel(current).build());
+    }
+
+    private static VespaModel createModel(String component) {
+        var xml = """
+                <services version='1.0'>
+                  <container id='cluster1' version='1.0'>
+                    <http>
+                      <server id='server1' port='8080'/>
+                    </http>
+                    %s
+                  </container>
+                </services>
+                """.formatted(component);
+        DeployState.Builder builder = deployStateBuilder();
+        return new VespaModelCreatorWithMockPkg(null, xml).create(builder);
+    }
+
+    private static VespaModel createModel() {
+        return createModel("");
+    }
+
+    private static String withComponent(String componentClass) {
+        return "<component id='llm' class='%s' />".formatted(componentClass);
+    }
+
+    private static DeployState.Builder deployStateBuilder() {
+        return new DeployState.Builder().properties(new TestProperties());
+    }
+
+    private static void assertStartsWith(String expected, List<ConfigChangeAction> result) {
+        assertTrue(result.get(0).getMessage().startsWith(expected));
+    }
+
+}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java
index 8778f0c26c0..0677cabafb0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java
@@ -29,11 +29,18 @@ public abstract class ContentClusterFixture {
         nextCluster = createCluster(nextSd);
     }
 
+    protected ContentClusterFixture(ContentCluster currentCluster, ContentCluster nextCluster) {
+        this.currentCluster = currentCluster;
+        this.nextCluster = nextCluster;
+    }
+
     public ContentClusterFixture(String entireSd) throws Exception {
-        currentCluster = new ContentClusterBuilder().build(
-            ContentClusterUtils.createMockRoot(List.of(entireSd)));
-        nextCluster = new ContentClusterBuilder().build(
-            ContentClusterUtils.createMockRoot(List.of(entireSd)));
+        currentCluster = createClusterFromEntireSd(entireSd);
+        nextCluster = createClusterFromEntireSd(entireSd);
+    }
+
+    protected static ContentCluster createClusterFromEntireSd(String sdContent) throws Exception {
+        return new ContentClusterBuilder().build(ContentClusterUtils.createMockRoot(List.of(sdContent)));
     }
 
     private static ContentCluster createCluster(String sdContent) throws Exception {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java
index cd54a20523f..247f01068fa 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java
@@ -39,6 +39,21 @@ public class IndexingScriptChangeValidatorTest {
         }
     }
 
+    private static class ComplexFixture extends ContentClusterFixture {
+        IndexingScriptChangeValidator validator;
+        public ComplexFixture(String currentSd, String nextSd) throws Exception {
+            super(createClusterFromEntireSd(currentSd), createClusterFromEntireSd(nextSd));
+            validator = new IndexingScriptChangeValidator(ClusterSpec.Id.from("test"),
+                    currentDb().getDerivedConfiguration().getSchema(),
+                    nextDb().getDerivedConfiguration().getSchema());
+        }
+
+        @Override
+        public List<VespaConfigChangeAction> validate() {
+            return validator.validate();
+        }
+    }
+
     private static class ScriptFixture {
 
         private final ScriptExpression currentScript;
@@ -56,6 +71,9 @@ public class IndexingScriptChangeValidatorTest {
 
     private static final String FIELD = "field f1 type string";
     private static final String FIELD_F2 = "field f2 type string";
+    private static final String TENSOR_FIELD_F1 = "field f1 type tensor(x[2])";
+    private static final String TENSOR_FIELD_F2 = "field f2 type tensor(x[2])";
+    private static final String TENSOR_FIELD_F3 = "field f3 type tensor(x[2])";
 
     private static VespaConfigChangeAction expectedReindexingAction(String changedMsg, String fromScript, String toScript) {
         return expectedReindexingAction("f1", changedMsg, fromScript, toScript);
@@ -115,6 +133,28 @@ public class IndexingScriptChangeValidatorTest {
     }
 
     @Test
+    void requireThatAddingIndexAspectForExtraTensorFieldWithChangedInputRequireReindexing() throws Exception {
+        new ComplexFixture(joinLines("schema test {",
+                "  document test {",
+                "    " + TENSOR_FIELD_F1 + " { }",
+                "    " + TENSOR_FIELD_F2 + " { }",
+                "  }",
+                "  " + TENSOR_FIELD_F3 + " { indexing: input f1 | attribute }",
+                "}"),
+                joinLines("schema test {",
+                        "  document test {",
+                        "    " + TENSOR_FIELD_F1 + " { }",
+                        "    " + TENSOR_FIELD_F2 + " { }",
+                        "  }",
+                        "  " + TENSOR_FIELD_F3 + " { indexing: input f2 | index | attribute }",
+                        "}")).
+                assertValidation(List.of(expectedReindexingAction("f3", "add index aspect",
+                                "{ input f1 | attribute f3; }",
+                                "{ input f2 | index f3 | attribute f3; }")));
+    }
+
+
+    @Test
     void requireThatSettingDynamicSummaryIsOk() throws Exception {
         new Fixture(FIELD + " { indexing: summary }",
                 FIELD + " { indexing: summary \n summary: dynamic }").