diff --git a/.buildkite/Makefile b/.buildkite/Makefile
index b2491bbd4786..43eba7a3db66 100644
--- a/.buildkite/Makefile
+++ b/.buildkite/Makefile
@@ -1,3 +1,4 @@
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 export TOP := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 
 export ARCH ?= $(shell if [[ $$(arch) == x86_64 ]]; then echo amd64; else echo arm64; fi)
diff --git a/.buildkite/basic-search-test.sh b/.buildkite/basic-search-test.sh
index 092484ece520..5daaa55e2d6a 100755
--- a/.buildkite/basic-search-test.sh
+++ b/.buildkite/basic-search-test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/bootstrap-cmake.sh b/.buildkite/bootstrap-cmake.sh
index 75d481423787..2512c7061e89 100755
--- a/.buildkite/bootstrap-cmake.sh
+++ b/.buildkite/bootstrap-cmake.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
+# shellcheck disable=1091
 source /etc/profile.d/enable-gcc-toolset.sh
 
 VESPA_CMAKE_SANITIZERS_OPTION=""
diff --git a/.buildkite/bootstrap.sh b/.buildkite/bootstrap.sh
index d00391709eca..1a29c117b4bd 100755
--- a/.buildkite/bootstrap.sh
+++ b/.buildkite/bootstrap.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/build-container.sh b/.buildkite/build-container.sh
index 4d2542917afa..1b91b2591345 100755
--- a/.buildkite/build-container.sh
+++ b/.buildkite/build-container.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/build-rpms.sh b/.buildkite/build-rpms.sh
index 3dc05e6e6ceb..642a4dc7d7a3 100755
--- a/.buildkite/build-rpms.sh
+++ b/.buildkite/build-rpms.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/cpp-test.sh b/.buildkite/cpp-test.sh
index dafc754742d8..96a888382f92 100755
--- a/.buildkite/cpp-test.sh
+++ b/.buildkite/cpp-test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/cpp.sh b/.buildkite/cpp.sh
index 1403bb916b11..6ee7effdfd06 100755
--- a/.buildkite/cpp.sh
+++ b/.buildkite/cpp.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
+# shellcheck disable=1091
 source /etc/profile.d/enable-gcc-toolset.sh
 
 cd "$SOURCE_DIR"
diff --git a/screwdriver/pubring.gpg.enc b/.buildkite/deploy/pubring.gpg.enc
similarity index 100%
rename from screwdriver/pubring.gpg.enc
rename to .buildkite/deploy/pubring.gpg.enc
diff --git a/screwdriver/secring.gpg.enc b/.buildkite/deploy/secring.gpg.enc
similarity index 100%
rename from screwdriver/secring.gpg.enc
rename to .buildkite/deploy/secring.gpg.enc
diff --git a/.buildkite/execute.sh b/.buildkite/execute.sh
index dcf42394e525..111167b28ea8 100755
--- a/.buildkite/execute.sh
+++ b/.buildkite/execute.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
@@ -7,7 +8,7 @@ if [[ $# != 1 ]]; then
   exit 1
 fi
 
-readonly MYDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd )"
+MYDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd )"
 readonly STEP=$1
 readonly VERBOSE=${VERBOSE:-}
 
diff --git a/.buildkite/go.sh b/.buildkite/go.sh
index 273a8282e9ed..c7d5f4aabddd 100755
--- a/.buildkite/go.sh
+++ b/.buildkite/go.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/install.sh b/.buildkite/install.sh
index 42faf5be0766..9a568c614435 100755
--- a/.buildkite/install.sh
+++ b/.buildkite/install.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/java.sh b/.buildkite/java.sh
index bc23533c56d3..fa40ff07c8a5 100755
--- a/.buildkite/java.sh
+++ b/.buildkite/java.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
+# shellcheck disable=1091
 source /etc/profile.d/enable-gcc-toolset.sh
 
 cd "$SOURCE_DIR"
diff --git a/.buildkite/plugins/factory-reporter/README.md b/.buildkite/plugins/factory-reporter/README.md
index 33297ad175b9..e8bbbc99a92c 100644
--- a/.buildkite/plugins/factory-reporter/README.md
+++ b/.buildkite/plugins/factory-reporter/README.md
@@ -1,4 +1,5 @@
 # Factory Reporter Buildkite Plugin
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 Reports a build to Vespa Factory
 
diff --git a/.buildkite/plugins/factory-reporter/hooks/pre-command b/.buildkite/plugins/factory-reporter/hooks/pre-command
index 3ae6fddf9d7b..50a8d0e45501 100755
--- a/.buildkite/plugins/factory-reporter/hooks/pre-command
+++ b/.buildkite/plugins/factory-reporter/hooks/pre-command
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/plugins/factory-reporter/hooks/pre-exit b/.buildkite/plugins/factory-reporter/hooks/pre-exit
index 1b0b3ef7513d..1f8e71389222 100755
--- a/.buildkite/plugins/factory-reporter/hooks/pre-exit
+++ b/.buildkite/plugins/factory-reporter/hooks/pre-exit
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -eo pipefail
 
diff --git a/.buildkite/plugins/factory-reporter/plugin.yml b/.buildkite/plugins/factory-reporter/plugin.yml
index 1164de7f96ec..81f488a4fc22 100644
--- a/.buildkite/plugins/factory-reporter/plugin.yml
+++ b/.buildkite/plugins/factory-reporter/plugin.yml
@@ -1,3 +1,4 @@
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 name: Factory Reporter
 description: Reports build pipeline status to Vespa Factory
 author: https://github.com/vespa-engine
diff --git a/.buildkite/prepare.sh b/.buildkite/prepare.sh
index cb48f3de7598..cec886ec7b53 100755
--- a/.buildkite/prepare.sh
+++ b/.buildkite/prepare.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
-"$SOURCE_DIR/screwdriver/replace-vespa-version-in-poms.sh" "$VESPA_VERSION" "$SOURCE_DIR"
+"$SOURCE_DIR/.buildkite/replace-vespa-version-in-poms.sh" "$VESPA_VERSION" "$SOURCE_DIR"
 
 # We disable javadoc for all modules not marked as public API
 for MODULE in $(comm -2 -3 \
diff --git a/.buildkite/publish-artifacts.sh b/.buildkite/publish-artifacts.sh
index 507232c5e83e..23a17d87bd02 100755
--- a/.buildkite/publish-artifacts.sh
+++ b/.buildkite/publish-artifacts.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/publish-container.sh b/.buildkite/publish-container.sh
index 824ebb8f6240..09a2ea833f2d 100755
--- a/.buildkite/publish-container.sh
+++ b/.buildkite/publish-container.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/.buildkite/quick-start-guide.sh b/.buildkite/quick-start-guide.sh
index 05cb08429479..dee77bcead44 100755
--- a/.buildkite/quick-start-guide.sh
+++ b/.buildkite/quick-start-guide.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
@@ -7,4 +8,4 @@ if [[ $VESPA_USE_SANITIZER != null ]]; then
     exit 0
 fi
 
-"$SOURCE_DIR/screwdriver/test-quick-start-guide.sh"
+"$SOURCE_DIR/.buildkite/test-quick-start-guide.sh"
diff --git a/screwdriver/release-ann-benchmark.sh b/.buildkite/release-ann-benchmark.sh
similarity index 78%
rename from screwdriver/release-ann-benchmark.sh
rename to .buildkite/release-ann-benchmark.sh
index 581ee289f191..438c5a5355b6 100755
--- a/screwdriver/release-ann-benchmark.sh
+++ b/.buildkite/release-ann-benchmark.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/ssh-agent /bin/bash
+# shellcheck shell=bash disable=SC1008
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
@@ -16,16 +17,17 @@ if [[ -z "$ANN_BENCHMARK_DEPLOY_TOKEN" ]]; then
 fi
 
 BUILD_DIR=$(mktemp -d)
+# shellcheck disable=2064
 trap "rm -rf $BUILD_DIR" EXIT
-cd $BUILD_DIR
+cd "$BUILD_DIR"
 
 ssh-add -D
-ssh-add <(echo $ANN_BENCHMARK_DEPLOY_TOKEN | base64 -d)
+ssh-add <(echo "$ANN_BENCHMARK_DEPLOY_TOKEN" | base64 -d)
 git clone git@github.com:vespa-engine/vespa-ann-benchmark
 cd vespa-ann-benchmark
 
 RELEASE_TAG="v$VESPA_VERSION"
-if ! git rev-parse $RELEASE_TAG &> /dev/null; then
+if ! git rev-parse "$RELEASE_TAG" &> /dev/null; then
     git tag -a "$RELEASE_TAG" -m "Release version $VESPA_VERSION"
     git push origin "$RELEASE_TAG"
 fi
diff --git a/screwdriver/release-container-image-crane.sh b/.buildkite/release-container-image-crane.sh
similarity index 50%
rename from screwdriver/release-container-image-crane.sh
rename to .buildkite/release-container-image-crane.sh
index e08ee2f7ed08..82f5ff16d21e 100755
--- a/screwdriver/release-container-image-crane.sh
+++ b/.buildkite/release-container-image-crane.sh
@@ -9,7 +9,7 @@ if [[ $# -ne 1 ]]; then
 fi
 
 readonly VESPA_VERSION=$1
-readonly VESPA_MAJOR=$(echo $VESPA_VERSION | cut -d. -f1)
+VESPA_MAJOR=$(echo "$VESPA_VERSION" | cut -d. -f1)
 
 if [[ -z "$DOCKER_HUB_DEPLOY_TOKEN" ]]; then
     echo "Environment variable DOCKER_HUB_DEPLOY_TOKEN must be set, but is empty."
@@ -20,33 +20,33 @@ if [[ -z "$GHCR_DEPLOY_TOKEN" ]]; then
     exit 1
 fi
 
-crane auth login -u aressem -p $GHCR_DEPLOY_TOKEN ghcr.io
-SRC_IMAGE=ghcr.io/vespa-engine/vespa-preview:$VESPA_VERSION
-SRC_IMAGE_DIGEST=$(crane digest $SRC_IMAGE)
+crane auth login -u aressem -p "$GHCR_DEPLOY_TOKEN" ghcr.io
+SRC_IMAGE="ghcr.io/vespa-engine/vespa-preview:$VESPA_VERSION"
+SRC_IMAGE_DIGEST=$(crane digest "$SRC_IMAGE")
 cosign verify \
     --certificate-identity https://buildkite.com/vespaai/vespa-engine-vespa \
     --certificate-oidc-issuer https://agent.buildkite.com \
-    $SRC_IMAGE@$SRC_IMAGE_DIGEST
+    "$SRC_IMAGE@$SRC_IMAGE_DIGEST"
 
 # Copy to Docker Hub
-if curl -fsSL https://hub.docker.com/v2/repositories/vespaengine/vespa/tags/$VESPA_VERSION &> /dev/null; then
+if curl -fsSL "https://hub.docker.com/v2/repositories/vespaengine/vespa/tags/$VESPA_VERSION" &> /dev/null; then
     echo "Container image docker.io/vespaengine/vespa:$VESPA_VERSION already exists."
 else
-  DST_IMAGE=docker.io/vespaengine/vespa:$VESPA_VERSION
-  crane auth login -u aressem -p $DOCKER_HUB_DEPLOY_TOKEN docker.io
-  crane cp $SRC_IMAGE@$SRC_IMAGE_DIGEST $DST_IMAGE
-  crane tag $DST_IMAGE $VESPA_MAJOR
-  crane tag $DST_IMAGE latest
+  DST_IMAGE="docker.io/vespaengine/vespa:$VESPA_VERSION"
+  crane auth login -u aressem -p "$DOCKER_HUB_DEPLOY_TOKEN" docker.io
+  crane cp "$SRC_IMAGE@$SRC_IMAGE_DIGEST" "$DST_IMAGE"
+  crane tag "$DST_IMAGE" "$VESPA_MAJOR"
+  crane tag "$DST_IMAGE" latest
 fi
 
 # Copy to GitHub Container Registry
-JWT=$(curl -sSL -u aressem:$GHCR_DEPLOY_TOKEN "https://ghcr.io/token?service=ghcr.io&scope=repository:vespa-engine/vespa:pull" | jq -re '.token')
+JWT=$(curl -sSL -u "aressem:$GHCR_DEPLOY_TOKEN" "https://ghcr.io/token?service=ghcr.io&scope=repository:vespa-engine/vespa:pull" | jq -re '.token')
 IMAGE_TAGS=$(curl -sSL -H "Authorization: Bearer $JWT" https://ghcr.io/v2/vespa-engine/vespa/tags/list | jq -re '.tags[]')
-if grep $VESPA_VERSION <<< "$IMAGE_TAGS" &> /dev/null; then
+if grep "$VESPA_VERSION" <<< "$IMAGE_TAGS" &> /dev/null; then
     echo "Container image ghcr.io/vespa-engine/vespa:$VESPA_VERSION already exists."
 else
-  DST_IMAGE=ghcr.io/vespa-engine/vespa:$VESPA_VERSION
-  crane cp $SRC_IMAGE@$SRC_IMAGE_DIGEST $DST_IMAGE
-  crane tag $DST_IMAGE $VESPA_MAJOR
-  crane tag $DST_IMAGE latest
+  DST_IMAGE="ghcr.io/vespa-engine/vespa:$VESPA_VERSION"
+  crane cp "$SRC_IMAGE@$SRC_IMAGE_DIGEST" "$DST_IMAGE"
+  crane tag "$DST_IMAGE" "$VESPA_MAJOR"
+  crane tag "$DST_IMAGE" latest
 fi
diff --git a/screwdriver/release-generic-container-image.sh b/.buildkite/release-generic-container-image.sh
similarity index 63%
rename from screwdriver/release-generic-container-image.sh
rename to .buildkite/release-generic-container-image.sh
index d996dc279c4c..79020f5ba63a 100755
--- a/screwdriver/release-generic-container-image.sh
+++ b/.buildkite/release-generic-container-image.sh
@@ -11,30 +11,31 @@ fi
 readonly VESPA_VERSION=$1
 readonly IMAGE_NAME="vespaengine/vespa-generic-intel-x86_64"
 
-if curl -fsSL https://hub.docker.com/v2/repositories/$IMAGE_NAME/tags/$VESPA_VERSION/ &> /dev/null; then
+if curl -fsSL "https://hub.docker.com/v2/repositories/$IMAGE_NAME/tags/$VESPA_VERSION/" &> /dev/null; then
   echo "Container image docker.io/$IMAGE_NAME:$VESPA_VERSION aldready exists."
   exit 0
 fi
 
 TMPDIR=$(mktemp -d)
+# shellcheck disable=2064
 trap "rm -rf $TMPDIR" EXIT
 
-pushd $TMPDIR
+pushd "$TMPDIR"
 git clone -q --filter tree:0 https://github.com/vespa-engine/vespa
-(cd vespa && git checkout v$VESPA_VERSION)
-(cd vespa && screwdriver/replace-vespa-version-in-poms.sh $VESPA_VERSION $(pwd) )
+(cd vespa && git checkout "v$VESPA_VERSION")
+(cd vespa && .buildkite/replace-vespa-version-in-poms.sh "$VESPA_VERSION" "$(pwd)" )
 
-make -C vespa -f .copr/Makefile srpm outdir=$(pwd)
+make -C vespa -f .copr/Makefile srpm outdir="$(pwd)"
 
 rpmbuild --rebuild \
   --define="_topdir $TMPDIR/vespa-rpmbuild" \
   --define "debug_package %{nil}" \
   --define "_debugsource_template %{nil}" \
   --define '_cmake_extra_opts "-DDEFAULT_VESPA_CPU_ARCH_FLAGS=-msse3 -mcx16 -mtune=intel"' \
-  *.src.rpm
+  ./*.src.rpm
 
-rm -f *.src.rpm
-mv $TMPDIR/vespa-rpmbuild/RPMS/*/*.rpm .
+rm -f ./*.src.rpm
+mv "$TMPDIR"/vespa-rpmbuild/RPMS/*/*.rpm .
 
 cat <<EOF > Dockerfile
 ARG VESPA_VERSION
@@ -46,18 +47,18 @@ EOF
 
 
 docker build --progress plain \
-  --build-arg VESPA_VERSION=$VESPA_VERSION \
-  --tag docker.io/$IMAGE_NAME:$VESPA_VERSION \
-  --tag docker.io/$IMAGE_NAME:latest \
+  --build-arg VESPA_VERSION="$VESPA_VERSION" \
+  --tag "docker.io/$IMAGE_NAME:$VESPA_VERSION" \
+  --tag "docker.io/$IMAGE_NAME:latest" \
   --tag vespaengine/vespa:latest \
   --file Dockerfile .
 
-vespa/screwdriver/test-quick-start-guide.sh
+vespa/.buildkite/test-quick-start-guide.sh
 
 OPT_STATE="$(set +o)"
 set +x
 docker login --username aressem --password "$DOCKER_HUB_DEPLOY_TOKEN"
 eval "$OPT_STATE"
-docker push docker.io/$IMAGE_NAME:$VESPA_VERSION
-docker push docker.io/$IMAGE_NAME:latest
+docker push "docker.io/$IMAGE_NAME:$VESPA_VERSION"
+docker push "docker.io/$IMAGE_NAME:latest"
 
diff --git a/.buildkite/release-java-artifacts.sh b/.buildkite/release-java-artifacts.sh
new file mode 100755
index 000000000000..7ffb938b9788
--- /dev/null
+++ b/.buildkite/release-java-artifacts.sh
@@ -0,0 +1,145 @@
+#!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+set -euo pipefail
+
+if [[ $# -ne 1 ]]; then
+    echo "Usage: $0 <Vespa release version>"
+    exit 1
+fi
+
+if [[ -z $OSSRH_USER ]] || [[ -z $OSSRH_TOKEN ]]  || [[ -z $GPG_KEYNAME ]] || [[ -z $GPG_PASSPHRASE_TOKEN ]] || [[ -z $GPG_ENCPHRASE_TOKEN ]]; then
+    echo -e "The follwing env variables must be set:\n OSSRH_USER\n OSSRH_TOKEN\n GPG_KEYNAME\n GPG_PASSPHRASE_TOKEN\n GPG_ENCPHRASE_TOKEN"
+    exit 1
+fi
+
+readonly VESPA_RELEASE="$1"
+
+# shellcheck shell=bash disable=SC1083
+QUERY_VERSION_HTTP_CODE=$(curl --write-out %{http_code} --silent --location --output /dev/null "https://oss.sonatype.org/content/repositories/releases/com/yahoo/vespa/parent/${VESPA_RELEASE}/parent-${VESPA_RELEASE}.pom")
+if [[ "200" == "$QUERY_VERSION_HTTP_CODE" ]]; then
+  echo "Vespa version $VESPA_RELEASE is already promoted, exiting"
+  exit 0
+fi
+
+SOURCE_DIR=$(pwd)
+export SOURCE_DIR
+
+mkdir -p "$SOURCE_DIR/.buildkite/deploy"
+# gpg-agent in RHEL 8 runs out of memory if we use Maven and sign in parallel. Add option to overcome this.
+echo "auto-expand-secmem" >> "$SOURCE_DIR/.buildkite/deploy/gpg-agent.conf"
+openssl aes-256-cbc -md md5 -pass "pass:$GPG_ENCPHRASE_TOKEN" -in "$SOURCE_DIR/.buildkite/deploy/pubring.gpg.enc" -out "$SOURCE_DIR/.buildkite/deploy/pubring.gpg" -d
+openssl aes-256-cbc -md md5 -pass "pass:$GPG_ENCPHRASE_TOKEN" -in "$SOURCE_DIR/.buildkite/deploy/secring.gpg.enc" -out "$SOURCE_DIR/.buildkite/deploy/secring.gpg" -d
+chmod 700 "$SOURCE_DIR/.buildkite/deploy"
+chmod 600 "$SOURCE_DIR"/.buildkite/deploy/*
+# shellcheck shell=bash disable=SC2064
+trap "rm -rf $SOURCE_DIR/.buildkite/deploy" EXIT
+
+# Number of parallel uploads
+NUM_PROC=10
+
+MVN=${MVN:-mvn}
+MVN_OPTS=${MVN_OPTS:-}
+MAVEN_GPG_PASSPHRASE=$GPG_PASSPHRASE_TOKEN
+export MVN
+export MVN_OPTS
+export MAVEN_GPG_PASSPHRASE
+
+TMP_STAGING=$(mktemp -d)
+export TMP_STAGING
+mkdir -p "$TMP_STAGING"
+# shellcheck disable=2064
+trap "rm -rf $TMP_STAGING" EXIT
+
+sign_module() {
+
+    #Debug
+    set -x
+
+    ECHO=""
+
+    P=$1
+    V=$(basename "$P")
+    A=$(basename "$(dirname "$P")")
+    G=$(dirname "$(dirname "$P")" | sed 's,/,.,g')
+    POM="$P/$A-$V.pom"
+    JAR="$P/$A-$V.jar"
+    if [[ -f $JAR ]]; then
+        FILE_OPTS="-Dfile=$JAR -Dpackaging=jar"
+    else
+        FILE_OPTS="-Dfile=$POM -Dpackaging=pom"
+    fi
+
+    AFILES=()
+    ATYPES=()
+    ACLASSIFIERS=()
+    # shellcheck disable=2044
+    for EX in $(find "$P" \( -name "$A-$V-*.jar" -or -name "$A-$V-*.zip" \) ); do
+        AFILES+=("$EX")
+        EXB=$(basename "$EX")
+        EXT=${EXB##*.}
+        ATYPES+=("$EXT")
+        EXF=${EXB%.*}
+        # shellcheck disable=2001
+        EXC=$(echo "$EXF"|sed "s,$A-$V-,,")
+        ACLASSIFIERS+=("$EXC")
+    done
+
+    if (( ${#AFILES[@]} > 0 )); then
+        # shellcheck disable=2001
+        EXTRA_FILES_OPTS="-Dfiles=$(echo "${AFILES[@]}" | sed 's/\ /,/g') -Dtypes=$(echo "${ATYPES[@]}" | sed 's/\ /,/g') -Dclassifiers=$(echo "${ACLASSIFIERS[@]}" | sed 's/\ /,/g')"
+    fi
+
+    # shellcheck disable=2086
+    $ECHO $MVN --settings="$SOURCE_DIR/.buildkite/settings-publish.xml" \
+          $MVN_OPTS gpg:sign-and-deploy-file \
+          -Durl="file://$TMP_STAGING" \
+          -DrepositoryId=maven-central \
+          -DgroupId="$G" \
+          -DartifactId="$A" \
+          -Dversion="$V" \
+          -DpomFile="$POM" \
+          -DgeneratePom=false \
+          $FILE_OPTS \
+          $EXTRA_FILES_OPTS
+
+}
+export -f sign_module
+
+#Debug
+set -x
+
+aws s3 cp "s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/amd64/maven-repo.tar" .
+aws s3 cp "s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/amd64/maven-repo.tar.pem" .
+aws s3 cp "s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/amd64/maven-repo.tar.sig" .
+cosign verify-blob --certificate-identity https://buildkite.com/vespaai/vespa-engine-vespa --certificate-oidc-issuer https://agent.buildkite.com --signature maven-repo.tar.sig --certificate maven-repo.tar.pem maven-repo.tar
+rm -rf maven-repo
+tar xvf maven-repo.tar
+REPO_ROOT=$(pwd)/maven-repo
+
+cd "$REPO_ROOT"
+find . -name "$VESPA_RELEASE" -type d | sed 's,^./,,' | xargs -n 1 -P $NUM_PROC -I '{}' bash -c "sign_module {}"
+
+# Required for the nexus plugin to work with JDK 17
+export MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED"
+
+LOGFILE=$(mktemp)
+# shellcheck disable=2086
+$MVN $MVN_OPTS --settings="$SOURCE_DIR/.buildkite/settings-publish.xml" \
+    org.sonatype.plugins:nexus-staging-maven-plugin:1.6.14:deploy-staged-repository \
+    -DrepositoryDirectory="$TMP_STAGING" \
+    -DnexusUrl=https://oss.sonatype.org \
+    -DserverId=ossrh \
+    -DautoReleaseAfterClose=false \
+    -DstagingProgressTimeoutMinutes=10 \
+    -DstagingProfileId=407c0c3e1a197 | tee "$LOGFILE"
+
+STG_REPO=$(grep 'Staging repository at http' "$LOGFILE" | head -1 | awk -F/ '{print $NF}')
+# shellcheck disable=2086
+$MVN $MVN_OPTS --settings="$SOURCE_DIR/.buildkite/settings-publish.xml" -N \
+    org.sonatype.plugins:nexus-staging-maven-plugin:1.6.14:rc-release \
+    -DnexusUrl=https://oss.sonatype.org/ \
+    -DserverId=ossrh \
+    -DstagingProgressTimeoutMinutes=10 \
+    -DstagingRepositoryId="$STG_REPO"
+
diff --git a/screwdriver/release-rpms.sh b/.buildkite/release-rpms.sh
similarity index 77%
rename from screwdriver/release-rpms.sh
rename to .buildkite/release-rpms.sh
index c539ed4be185..6626d4ec615a 100755
--- a/screwdriver/release-rpms.sh
+++ b/.buildkite/release-rpms.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/ssh-agent /bin/bash 
+# shellcheck shell=bash disable=SC1008
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
@@ -32,18 +33,18 @@ fi
 echo "Using vespa repository git reference: $VESPA_REF"
 ssh-add -D
 set +x
-ssh-add <(echo $VESPA_DEPLOY_TOKEN | base64 -d)
+ssh-add <(echo "$VESPA_DEPLOY_TOKEN" | base64 -d)
 set -x
 git clone git@github.com:vespa-engine/vespa
 
 cd vespa
-dist/release-vespa-rpm.sh $VESPA_RELEASE $VESPA_REF
+dist/release-vespa-rpm.sh "$VESPA_RELEASE" "$VESPA_REF"
 
 upload_rpms() {
   local ARCH=$1
-  aws s3 cp  s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/$ARCH/rpm-repo.tar .
-  aws s3 cp  s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/$ARCH/rpm-repo.tar.pem .
-  aws s3 cp  s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/$ARCH/rpm-repo.tar.sig .
+  aws s3 cp  "s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/$ARCH/rpm-repo.tar" .
+  aws s3 cp  "s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/$ARCH/rpm-repo.tar.pem" .
+  aws s3 cp  "s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/$ARCH/rpm-repo.tar.sig" .
   cosign verify-blob \
     --certificate-identity https://buildkite.com/vespaai/vespa-engine-vespa \
     --certificate-oidc-issuer https://agent.buildkite.com \
@@ -52,7 +53,7 @@ upload_rpms() {
     rpm-repo.tar
   tar xvf rpm-repo.tar
   for rpm in rpms/*.rpm; do
-    screwdriver/upload-rpm-to-cloudsmith.sh $rpm
+    .github/scripts/upload-rpm-to-cloudsmith.sh "$rpm"
   done
   rm -rf rpms rpm-repo.*
 }
diff --git a/screwdriver/replace-vespa-version-in-poms.sh b/.buildkite/replace-vespa-version-in-poms.sh
similarity index 93%
rename from screwdriver/replace-vespa-version-in-poms.sh
rename to .buildkite/replace-vespa-version-in-poms.sh
index d57f126aac96..dbfc84ccf615 100755
--- a/screwdriver/replace-vespa-version-in-poms.sh
+++ b/.buildkite/replace-vespa-version-in-poms.sh
@@ -11,7 +11,7 @@ fi
 readonly VESPA_VERSION=$1
 readonly DIR=$2
 
-find $DIR -name "pom.xml" -exec sed -i \
+find "$DIR" -name "pom.xml" -exec sed -i \
      -e "s,<version>.*SNAPSHOT.*</version>,<version>$VESPA_VERSION</version>," \
      -e "s,<vespaversion>.*project.version.*</vespaversion>,<vespaversion>$VESPA_VERSION</vespaversion>," \
      -e "s,<test-framework.version>.*project.version.*</test-framework.version>,<test-framework.version>$VESPA_VERSION</test-framework.version>," \
diff --git a/screwdriver/settings-publish.xml b/.buildkite/settings-publish.xml
similarity index 93%
rename from screwdriver/settings-publish.xml
rename to .buildkite/settings-publish.xml
index 116b1de83a96..8afb8c930941 100644
--- a/screwdriver/settings-publish.xml
+++ b/.buildkite/settings-publish.xml
@@ -20,7 +20,7 @@
                 <gpg.executable>gpg</gpg.executable>
                 <gpg.keyname>${env.GPG_KEYNAME}</gpg.keyname>
                 <gpg.defaultKeyring>false</gpg.defaultKeyring>
-                <gpg.homedir>${env.SOURCE_DIR}/screwdriver/deploy</gpg.homedir>
+                <gpg.homedir>${env.SOURCE_DIR}/.buildkite/deploy</gpg.homedir>
                 <gpg.publickeyring>pubring.gpg</gpg.publickeyring>
                 <gpg.secretkeyring>secring.gpg</gpg.secretkeyring>
             </properties>
diff --git a/screwdriver/test-quick-start-guide.sh b/.buildkite/test-quick-start-guide.sh
similarity index 75%
rename from screwdriver/test-quick-start-guide.sh
rename to .buildkite/test-quick-start-guide.sh
index 577d6561b853..87497fa8d69c 100755
--- a/screwdriver/test-quick-start-guide.sh
+++ b/.buildkite/test-quick-start-guide.sh
@@ -6,9 +6,10 @@
 set -xeuo pipefail
 
 TESTDIR=$(mktemp -d)
+# shellcheck disable=SC2064
 trap "rm -rf $TESTDIR" EXIT
 
-cd $TESTDIR
+cd "$TESTDIR"
 
 # Clone and setup doc tests
 git clone -q --depth 1 https://github.com/vespa-engine/documentation
@@ -23,8 +24,8 @@ if [[ $(arch) == x86_64 ]]; then
 else
   GO_ARCH=arm64
 fi
-curl -fsSL https://github.com/vespa-engine/vespa/releases/download/v${VESPA_CLI_VERSION}/vespa-cli_${VESPA_CLI_VERSION}_linux_${GO_ARCH}.tar.gz | tar -zxf - -C /opt
-ln -sf /opt/vespa-cli_${VESPA_CLI_VERSION}_linux_${GO_ARCH}/bin/vespa /usr/local/bin/
+curl -fsSL "https://github.com/vespa-engine/vespa/releases/download/v${VESPA_CLI_VERSION}/vespa-cli_${VESPA_CLI_VERSION}_linux_${GO_ARCH}.tar.gz" | tar -zxf - -C /opt
+ln -sf "/opt/vespa-cli_${VESPA_CLI_VERSION}_linux_${GO_ARCH}/bin/vespa" /usr/local/bin/
 
 # Run test
 python3 test/test.py -v -c test/_quick-start.yaml
diff --git a/screwdriver/update-vespa-version-in-sample-apps.sh b/.buildkite/update-vespa-version-in-sample-apps.sh
similarity index 74%
rename from screwdriver/update-vespa-version-in-sample-apps.sh
rename to .buildkite/update-vespa-version-in-sample-apps.sh
index b1d15a2f0776..8dfab9a16cfe 100755
--- a/screwdriver/update-vespa-version-in-sample-apps.sh
+++ b/.buildkite/update-vespa-version-in-sample-apps.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/ssh-agent /bin/bash
+# shellcheck shell=bash disable=SC1008
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
@@ -9,26 +10,29 @@ if [[ $# -ne 1 ]]; then
     exit 1
 fi
 
-export VESPA_RELEASE="$1"
-export JAVA_HOME=$(dirname $(dirname $(readlink -f /usr/bin/java)))
+VESPA_RELEASE="$1"
+JAVA_HOME="$(dirname "$(dirname "$(readlink -f /usr/bin/java)")")"
+export VESPA_RELEASE
+export JAVA_HOME
 
 BUILD_DIR=$(mktemp -d)
+# shellcheck disable=2064
 trap "rm -rf $BUILD_DIR" EXIT
-cd $BUILD_DIR
+cd "$BUILD_DIR"
 
 function is_published {
     local TMP_MVN_REPO=$BUILD_DIR/maven-repo
-    echo $TMP_MVN_REPO
-    mkdir -p $TMP_MVN_REPO
-    rm -rf $TMP_MVN_REPO/com/yahoo/vespa
+    echo "$TMP_MVN_REPO"
+    mkdir -p "$TMP_MVN_REPO"
+    rm -rf "$TMP_MVN_REPO/com/yahoo/vespa"
     # Because the transfer of artifacts to Maven Central is not atomic we can't just check a simple pom or jar to be available. Because of this we
     # check that the publication is complete enough to compile a Java sample app
 
     # Update Vespa version property in pom.xml
-    if ! mvn -V -B versions:set-property -Dproperty=vespa_version -DnewVersion=${VESPA_RELEASE}; then
+    if ! mvn -V -B versions:set-property -Dproperty=vespa_version -DnewVersion="$VESPA_RELEASE"; then
         return 1
     fi
-    if mvn -V -B -pl ai.vespa.examples:album-recommendation-java -Dmaven.repo.local=$TMP_MVN_REPO -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests clean package; then
+    if mvn -V -B -pl ai.vespa.examples:album-recommendation-java -Dmaven.repo.local="$TMP_MVN_REPO" -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests clean package; then
         return 0
     else
         return 1
@@ -40,7 +44,7 @@ function wait_until_published {
     until is_published; do
         ((cnt+=1))
         # Wait max 60 minutes
-        if (( $cnt > 60 )); then
+        if (( cnt > 60 )); then
             echo "ERROR: Artifacts with version ${VESPA_RELEASE} not found on central maven repo."
             exit 1
         fi
@@ -51,7 +55,7 @@ function wait_until_published {
 
 ssh-add -D
 set +x
-ssh-add <(echo $SAMPLE_APPS_DEPLOY_TOKEN | base64 -d)
+ssh-add <(echo "$SAMPLE_APPS_DEPLOY_TOKEN" | base64 -d)
 set -x
 
 git clone git@github.com:vespa-engine/sample-apps.git
diff --git a/.buildkite/upload-test-results.sh b/.buildkite/upload-test-results.sh
index e95a9448adf5..2e3c6f6ea5b7 100755
--- a/.buildkite/upload-test-results.sh
+++ b/.buildkite/upload-test-results.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/screwdriver/wait-for-buildkite-build.sh b/.buildkite/wait-for-buildkite-build.sh
similarity index 94%
rename from screwdriver/wait-for-buildkite-build.sh
rename to .buildkite/wait-for-buildkite-build.sh
index 582e5f376927..c13ff9ae2d6b 100755
--- a/screwdriver/wait-for-buildkite-build.sh
+++ b/.buildkite/wait-for-buildkite-build.sh
@@ -11,7 +11,7 @@ URL=$1
 WEB_URL=$2
 TIMEOUT=$3
 
-WAIT_UNTIL=$(( $(date +%s) + $TIMEOUT ))
+WAIT_UNTIL=$(( $(date +%s) + "$TIMEOUT" ))
 while [[ $(date +%s) -le $WAIT_UNTIL ]]; do
     STATUS=$(curl -sSL -H "Content-Type: application/json" -H "Authorization: Bearer $BUILDKITE_TRIGGER_TOKEN" "$URL" | jq -re '.state')
 
diff --git a/build_settings.cmake b/build_settings.cmake
index cb5b19e77abe..995e0eedbc87 100644
--- a/build_settings.cmake
+++ b/build_settings.cmake
@@ -167,8 +167,8 @@ SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -rdynamic" )
 
 message("-- CMAKE_SHARED_LINKER_FLAGS is ${CMAKE_SHARED_LINKER_FLAGS}")
 
-# Use C++ 20
-set(CMAKE_CXX_STANDARD 20)
+# Use C++ 23
+set(CMAKE_CXX_STANDARD 23)
 
 # Always build shared libs if not explicitly specified
 set(BUILD_SHARED_LIBS ON)
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index 8675b6792390..ce9869001acf 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -122,7 +122,7 @@ interface FeatureFlags {
         @ModelFeatureFlag(owners = {"vekterli"}) default boolean enforceStrictlyIncreasingClusterStateVersions() { return false; }
         @ModelFeatureFlag(owners = {"vekterli"}) default boolean distributionConfigFromClusterController() { return false; }
         @ModelFeatureFlag(owners = {"arnej"}) default boolean useLegacyWandQueryParsing() { return true; }
-        @ModelFeatureFlag(owners = {"hmusum"}) default boolean forwardAllLogLevels() { return false; }
+        @ModelFeatureFlag(owners = {"hmusum"}) default boolean forwardAllLogLevels() { return true; }
     }
 
     /** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java
index 3f336544a99b..55abf02e39ea 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java
@@ -76,7 +76,7 @@ protected boolean shouldConvert(Expression exp) {
                 String fieldName = ((OutputExpression)exp).getFieldName();
                 if (outputs.contains(fieldName) && !prevNames.contains(fieldName)) {
                     throw new VerificationException(exp, "Attempting to assign conflicting values to field '" +
-                                                         fieldName + "'.");
+                                                         fieldName + "'");
                 }
                 outputs.add(fieldName);
                 prevNames.add(fieldName);
@@ -111,24 +111,24 @@ public DataType getInputType(Expression exp, String fieldName) {
         }
 
         @Override
-        public void tryOutputType(Expression exp, String fieldName, DataType valueType) {
+        public void tryOutputType(Expression expression, String fieldName, DataType valueType) {
             String fieldDesc;
             DataType fieldType;
-            if (exp instanceof AttributeExpression) {
+            if (expression instanceof AttributeExpression) {
                 Attribute attribute = schema.getAttribute(fieldName);
                 if (attribute == null) {
-                    throw new VerificationException(exp, "Attribute '" + fieldName + "' not found.");
+                    throw new VerificationException(expression, "Attribute '" + fieldName + "' not found.");
                 }
                 fieldDesc = "attribute";
                 fieldType = attribute.getDataType();
-            } else if (exp instanceof IndexExpression) {
+            } else if (expression instanceof IndexExpression) {
                 SDField field = schema.getConcreteField(fieldName);
                 if (field == null) {
-                    throw new VerificationException(exp, "Index field '" + fieldName + "' not found.");
+                    throw new VerificationException(expression, "Index field '" + fieldName + "' not found.");
                 }
                 fieldDesc = "index field";
                 fieldType = field.getDataType();
-            } else if (exp instanceof SummaryExpression) {
+            } else if (expression instanceof SummaryExpression) {
                 SummaryField field = schema.getSummaryField(fieldName);
                 if (field == null) {
                     // Use document field if summary field is not found
@@ -137,7 +137,7 @@ public void tryOutputType(Expression exp, String fieldName, DataType valueType)
                         fieldDesc = "document field";
                         fieldType = sdField.getDataType();
                     } else {
-                        throw new VerificationException(exp, "Summary field '" + fieldName + "' not found.");
+                        throw new VerificationException(expression, "Summary field '" + fieldName + "' not found.");
                     }
                 } else {
                     fieldDesc = "summary field";
@@ -148,8 +148,8 @@ public void tryOutputType(Expression exp, String fieldName, DataType valueType)
             }
             if ( ! fieldType.isAssignableFrom(valueType) &&
                  ! fieldType.isAssignableFrom(createCompatType(valueType))) {
-                throw new VerificationException(exp, "Can not assign " + valueType.getName() + " to " + fieldDesc +
-                                                     " '" + fieldName + "' which is " + fieldType.getName() + ".");
+                throw new VerificationException(expression, "Can not assign " + valueType.getName() + " to " + fieldDesc +
+                                                            " '" + fieldName + "' which is " + fieldType.getName() + ".");
             }
         }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index 85ddd42ab226..aa4143a89f18 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -197,6 +197,7 @@ public ZooKeepersConfigProvider getZooKeepersConfigProvider() {
     }
 
     public void getConfig(LogdConfig.Builder builder) {
+        var forwardAllLogLevels = isHostedVespa && featureFlags.forwardAllLogLevels();
         if (logserver == null) {
             builder.logserver(new LogdConfig.Logserver.Builder().use(false));
         }
@@ -206,8 +207,8 @@ public void getConfig(LogdConfig.Builder builder) {
                         host(logserver.getHostName()).
                         rpcport(logserver.getRelativePort(0)))
                     .loglevel(new LogdConfig.Loglevel.Builder().
-                            debug(new LogdConfig.Loglevel.Debug.Builder().forward(featureFlags.forwardAllLogLevels())).
-                            spam(new LogdConfig.Loglevel.Spam.Builder().forward(featureFlags.forwardAllLogLevels())));
+                            debug(new LogdConfig.Loglevel.Debug.Builder().forward(forwardAllLogLevels)).
+                            spam(new LogdConfig.Loglevel.Spam.Builder().forward(forwardAllLogLevels)));
         }
      }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java
index b375c835d2c4..a4b08b5c7fd3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java
@@ -113,7 +113,7 @@ private static void throwIfBudgetExceeded(double spend, BigDecimal budget, Syste
 
     private static String quotaMessage(String message, SystemName system, double spend, BigDecimal budget, boolean actual) {
         String quotaDescription = String.format(Locale.ENGLISH,
-                                                "The %s cost $%.2f but your quota is $%.2f",
+                                                "The %s cost $%.2f but your remaining quota is $%.2f",
                                                 actual ? "resources used" : "max resources specified",
                                                 spend,
                                                 budget);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudAsmSecrets.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudAsmSecrets.java
index 69dc5cc7c6d4..6819548bea18 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudAsmSecrets.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudAsmSecrets.java
@@ -3,6 +3,8 @@
 
 import ai.vespa.secret.config.aws.AsmSecretConfig;
 import com.yahoo.config.provision.AthenzDomain;
+import com.yahoo.config.provision.SystemName;
+import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.vespa.model.container.component.SimpleComponent;
@@ -14,22 +16,29 @@
  */
 public class CloudAsmSecrets extends SimpleComponent implements AsmSecretConfig.Producer {
 
-    private static final String CLASS = "ai.vespa.secret.aws.AsmSecretStore";
+    private static final String CLASS = "ai.vespa.secret.aws.AsmTenantSecretReader";
     private static final String BUNDLE = "jdisc-cloud-aws";
 
     private final URI ztsUri;
     private final AthenzDomain athenzDomain;
+    private final SystemName system;
+    private final TenantName tenant;
 
-    public CloudAsmSecrets(URI ztsUri, AthenzDomain athenzDomain) {
+    public CloudAsmSecrets(URI ztsUri, AthenzDomain athenzDomain,
+                           SystemName system, TenantName tenant) {
         super(new ComponentModel(BundleInstantiationSpecification.fromStrings(CLASS, CLASS, BUNDLE)));
         this.ztsUri = ztsUri;
         this.athenzDomain =  athenzDomain;
+        this.system = system;
+        this.tenant = tenant;
     }
 
     @Override
     public void getConfig(AsmSecretConfig.Builder builder) {
         builder.ztsUri(ztsUri.toString())
-                .athenzDomain(athenzDomain.value());
+                .athenzDomain(athenzDomain.value())
+                .system(system.value())
+                .tenant(tenant.value());
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 0243075d4574..72ac906b8e00 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -238,7 +238,7 @@ private void addClusterContent(ApplicationContainerCluster cluster, Element spec
         // Must be added after nodes:
         addDeploymentSpecConfig(cluster, context, deployState.getDeployLogger());
         addZooKeeper(cluster, spec);
-        addAthenzServiceIdentityProvider(cluster, context, deployState.getDeployLogger());
+        addAthenzServiceIdentityProvider(cluster, context);
 
         addParameterStoreValidationHandler(cluster, deployState);
     }
@@ -316,7 +316,9 @@ private void addSecrets(ApplicationContainerCluster cluster, Element spec, Deplo
             }
             cluster.addComponent(secretsConfig);
             cluster.addComponent(new CloudAsmSecrets(deployState.getProperties().ztsUrl(),
-                                                     deployState.getProperties().tenantSecretDomain()));
+                                                     deployState.getProperties().tenantSecretDomain(),
+                                                     deployState.zone().system(),
+                                                     deployState.getProperties().applicationId().tenant()));
         }
     }
 
@@ -366,7 +368,7 @@ private void addCloudSecretStore(ApplicationContainerCluster cluster, Element se
         cluster.addComponent(cloudSecretStore);
     }
 
-    private void addAthenzServiceIdentityProvider(ApplicationContainerCluster cluster, ConfigModelContext context, DeployLogger deployLogger) {
+    private void addAthenzServiceIdentityProvider(ApplicationContainerCluster cluster, ConfigModelContext context) {
         if ( ! context.getDeployState().isHosted()) return;
         if ( ! context.getDeployState().zone().system().isPublic()) return; // Non-public is handled by deployment spec config.
         if ( ! context.properties().launchApplicationAthenzService()) return;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ModelIdResolver.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ModelIdResolver.java
index ac4b4623e42a..b112ce23089f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ModelIdResolver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ModelIdResolver.java
@@ -62,8 +62,15 @@ private static Map<String, ProvidedModel> setupProvidedModels() {
         register(m, "e5-large-v2", "https://data.vespa-cloud.com/onnx_models/e5-large-v2/model.onnx", Set.of(ONNX_MODEL));
         register(m, "e5-large-v2-vocab", "https://data.vespa-cloud.com/onnx_models/e5-large-v2/tokenizer.json", Set.of(HF_TOKENIZER));
 
-        register(m, "mistral-7b",    "https://data.vespa-cloud.com/gguf_models/mistral-7b-instruct-v0.1.Q6_K.gguf", Set.of(GGUF_MODEL));
-        register(m, "mistral-7b-q8", "https://data.vespa-cloud.com/gguf_models/mistral-7b-instruct-v0.1.Q8_0.gguf", Set.of(GGUF_MODEL));
+        register(m, "llama-3.2-1b-q4", "https://data.vespa-cloud.com/gguf_models/llama-3.2-1b-instruct-q4_k_m.gguf", Set.of(GGUF_MODEL));
+        register(m, "llama-3.2-1b",    "https://data.vespa-cloud.com/gguf_models/llama-3.2-1b-instruct-q8_0.gguf", Set.of(GGUF_MODEL));
+        register(m, "llama-3.2-3b-q4", "https://data.vespa-cloud.com/gguf_models/llama-3.2-3b-instruct-q4_k_m.gguf", Set.of(GGUF_MODEL));
+        register(m, "llama-3.2-3b",    "https://data.vespa-cloud.com/gguf_models/llama-3.2-3b-instruct-q8_0.gguf", Set.of(GGUF_MODEL));
+        register(m, "mistral-7b",      "https://data.vespa-cloud.com/gguf_models/mistral-7b-instruct-v0.1.Q6_K.gguf", Set.of(GGUF_MODEL));
+        register(m, "mistral-7b-q8",   "https://data.vespa-cloud.com/gguf_models/mistral-7b-instruct-v0.1.Q8_0.gguf", Set.of(GGUF_MODEL));
+        register(m, "phi-3.5-mini-q4", "https://data.vespa-cloud.com/gguf_models/Phi-3.5-mini-instruct-Q4_K_M.gguf", Set.of(GGUF_MODEL));
+
+        register(m, "significance-en-wikipedia-v1", "https://data.vespa-cloud.com/significance_models/significance-en-wikipedia-v1.json.zst", Set.of(SIGNIFICANCE_MODEL));
         return Map.copyOf(m);
     }
 
diff --git a/config-model/src/test/cfg/significance/services.xml b/config-model/src/test/cfg/significance/hosted/services.xml
similarity index 85%
rename from config-model/src/test/cfg/significance/services.xml
rename to config-model/src/test/cfg/significance/hosted/services.xml
index ffdb73bfc2e3..258dc685a849 100644
--- a/config-model/src/test/cfg/significance/services.xml
+++ b/config-model/src/test/cfg/significance/hosted/services.xml
@@ -8,7 +8,7 @@
   <container version="1.0">
     <search>
         <significance>
-            <model model-id="idf-wiki-english" path="models/idf-english-wiki.json.zst"/>
+            <model model-id="significance-en-wikipedia-v1"/>
             <model path="models/idf-norwegian-wiki.json.zst" />
             <model url="https://some/uri/blob.json" />
         </significance>
diff --git a/config-model/src/test/cfg/significance/hosts.xml b/config-model/src/test/cfg/significance/selfhosted/hosts.xml
similarity index 100%
rename from config-model/src/test/cfg/significance/hosts.xml
rename to config-model/src/test/cfg/significance/selfhosted/hosts.xml
diff --git a/config-model/src/test/cfg/significance/selfhosted/services.xml b/config-model/src/test/cfg/significance/selfhosted/services.xml
new file mode 100644
index 000000000000..a66524eea978
--- /dev/null
+++ b/config-model/src/test/cfg/significance/selfhosted/services.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<services>
+  <admin version="2.0">
+    <adminserver hostalias="node0"/>
+    <logserver hostalias="node0"/>
+  </admin>
+  <container version="1.0">
+    <search>
+        <significance>
+            <model model-id="significance-en-wikipedia-v1" path="models/significance-en-wikipedia-v1.json.zst"/>
+            <model path="models/idf-norwegian-wiki.json.zst" />
+            <model url="https://some/uri/blob.json" />
+        </significance>
+    </search>
+  </container>
+</services>
+
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java
index d5af996bd59b..ebaa0ef37b0e 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java
@@ -57,7 +57,7 @@ void requireThatOutputConflictThrows() throws ParseException {
         }
         catch (IllegalArgumentException e) {
             assertEquals("For schema 'indexing_output_confict', field 'bar': For expression 'index bar': Attempting " +
-                         "to assign conflicting values to field 'bar'.",
+                         "to assign conflicting values to field 'bar'",
                          Exceptions.toMessageString(e));
         }
     }
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/IndexingValidationTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingValidationTestCase.java
index 4053834784f8..898f3f5b23d7 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/IndexingValidationTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingValidationTestCase.java
@@ -36,7 +36,7 @@ void testAttributeChanged() throws ParseException {
         }
         catch (IllegalArgumentException e) {
             assertEquals("For schema 'indexing_attribute_changed', field 'foo': For expression 'attribute foo': " +
-                         "Attempting to assign conflicting values to field 'foo'.",
+                         "Attempting to assign conflicting values to field 'foo'",
                          Exceptions.toMessageString(e));
         }
     }
@@ -80,7 +80,7 @@ void testIndexChanged() throws ParseException {
         }
         catch (IllegalArgumentException e) {
             assertEquals("For schema 'indexing_index_changed', field 'foo': For expression 'index foo': " +
-                         "Attempting to assign conflicting values to field 'foo'.",
+                         "Attempting to assign conflicting values to field 'foo'",
                          Exceptions.toMessageString(e));
         }
     }
@@ -124,7 +124,7 @@ void testSummaryChanged() throws ParseException {
         }
         catch (IllegalArgumentException e) {
             assertEquals("For schema 'indexing_summary_fail', field 'foo': For expression 'summary foo': Attempting " +
-                         "to assign conflicting values to field 'foo'.",
+                         "to assign conflicting values to field 'foo'",
                          Exceptions.toMessageString(e));
         }
     }
@@ -186,7 +186,7 @@ void requireThatMultilineOutputConflictThrows() throws ParseException {
         }
         catch (IllegalArgumentException e) {
             assertEquals("For schema 'indexing_multiline_output_confict', field 'cox': For expression 'index cox': " +
-                         "Attempting to assign conflicting values to field 'cox'.",
+                         "Attempting to assign conflicting values to field 'cox'",
                          Exceptions.toMessageString(e));
         }
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java
index 590433757c35..059411b7a9d2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java
@@ -49,7 +49,7 @@ void test_deploy_above_quota_budget() {
             tester.deploy(null, getServices(10), Environment.prod, null, CONTAINER_CLUSTER);
             fail();
         } catch (RuntimeException e) {
-            assertEquals("The resources used cost $1.63 but your quota is $1.25: Contact support to upgrade your plan.", e.getMessage());
+            assertEquals("The resources used cost $1.63 but your remaining quota is $1.25: Contact support to upgrade your plan.", e.getMessage());
         }
     }
 
@@ -66,7 +66,7 @@ void test_deploy_above_quota_budget_in_publiccd() {
             tester.deploy(null, getServices(10), Environment.prod, null, CONTAINER_CLUSTER);
             fail();
         } catch (RuntimeException e) {
-            assertEquals("publiccd: The resources used cost $1.63 but your quota is $1.00: Contact support to upgrade your plan.", e.getMessage());
+            assertEquals("publiccd: The resources used cost $1.63 but your remaining quota is $1.00: Contact support to upgrade your plan.", e.getMessage());
         }
     }
 
@@ -77,7 +77,7 @@ void test_deploy_max_resources_above_quota() {
             tester.deploy(null, getServices(10), Environment.prod, null, CONTAINER_CLUSTER);
             fail();
         } catch (RuntimeException e) {
-            assertEquals("publiccd: The resources used cost $1.63 but your quota is $1.25: Contact support to upgrade your plan.", e.getMessage());
+            assertEquals("publiccd: The resources used cost $1.63 but your remaining quota is $1.25: Contact support to upgrade your plan.", e.getMessage());
         }
     }
 
@@ -92,7 +92,7 @@ void test_deploy_above_quota_budget_in_dev() {
             tester.deploy(null, getServices(2, false), Environment.dev, null, CONTAINER_CLUSTER);
             fail();
         } catch (RuntimeException e) {
-            assertEquals("The resources used cost $0.16 but your quota is $0.01: Contact support to upgrade your plan.", e.getMessage());
+            assertEquals("The resources used cost $0.16 but your remaining quota is $0.01: Contact support to upgrade your plan.", e.getMessage());
         }
 
         // Override so that we will get 2 nodes in content cluster
@@ -100,7 +100,7 @@ void test_deploy_above_quota_budget_in_dev() {
             tester.deploy(null, getServices(2, true), Environment.dev, null, CONTAINER_CLUSTER);
             fail();
         } catch (RuntimeException e) {
-            assertEquals("The resources used cost $0.33 but your quota is $0.01: Contact support to upgrade your plan.", e.getMessage());
+            assertEquals("The resources used cost $0.33 but your remaining quota is $0.01: Contact support to upgrade your plan.", e.getMessage());
         }
     }
 
@@ -112,7 +112,7 @@ void test_deploy_with_negative_budget() {
             tester.deploy(null, getServices(10), Environment.prod, null, CONTAINER_CLUSTER);
             fail();
         } catch (RuntimeException e) {
-            assertEquals("The resources used cost $-.-- but your quota is $--.--: Please free up some capacity.",
+            assertEquals("The resources used cost $-.-- but your remaining quota is $--.--: Please free up some capacity.",
                          ValidationTester.censorNumbers(e.getMessage()));
         }
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/significance/test/SignificanceModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/significance/test/SignificanceModelTestCase.java
index 26e8c67a226b..2aa10a20f3d7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/significance/test/SignificanceModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/significance/test/SignificanceModelTestCase.java
@@ -5,47 +5,103 @@
 import com.yahoo.config.InnerNode;
 import com.yahoo.config.ModelNode;
 import com.yahoo.config.ModelReference;
+import com.yahoo.config.model.api.ApplicationClusterEndpoint;
+import com.yahoo.config.model.api.ContainerEndpoint;
+
+import com.yahoo.config.model.application.provider.FilesApplicationPackage;
+import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.config.model.deploy.TestProperties;
+import com.yahoo.path.Path;
 import com.yahoo.search.significance.config.SignificanceConfig;
+
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.component.SignificanceModelRegistry;
-import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
+
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
- * @author MariusArhaug
+ * @author MariusArhaug, glebashnik
  */
 
 public class SignificanceModelTestCase {
-    private VespaModel createModel(String filename) {
-        return new VespaModelCreatorWithFilePkg(filename).create();
-    }
-
     @Test
-    void testIndexGreaterThanNumNodes() {
-        VespaModel vespaModel = createModel("src/test/cfg/significance");
-        ApplicationContainerCluster containerCluster = vespaModel.getContainerClusters().get("container");
-        assertEquals(1, containerCluster.getContainers().size());
+    void testSignificanceModelConfig_selfhosted() throws Exception {
+        var vespaModel = loadModel(Path.fromString("src/test/cfg/significance/selfhosted/"), false);
+
+        var cluster = vespaModel.getContainerClusters().get("container");
+        assertEquals(1, cluster.getContainers().size());
+
+        var significanceConfig = assertSignificancePresent(cluster);
+        assertEquals(3, significanceConfig.model().size());
+
+        assertModel(significanceConfig.model(0),
+                Optional.of("significance-en-wikipedia-v1"),
+                Optional.of("models/significance-en-wikipedia-v1.json.zst"),
+                Optional.empty()
+        );
+
+        assertModel(significanceConfig.model(1),
+                Optional.empty(),
+                Optional.of("models/idf-norwegian-wiki.json.zst"),
+                Optional.empty()
+        );
+
+        assertModel(significanceConfig.model(2),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.of("https://some/uri/blob.json")
+        );
     }
 
     @Test
-    void testSignificance() {
-        VespaModel vespaModel = createModel("src/test/cfg/significance");
-        ApplicationContainerCluster containerCluster = vespaModel.getContainerClusters().get("container");
-        var significanceConfig = assertSignificancePresent(containerCluster);
+    void testSignificanceModelConfig_hosted() throws Exception {
+        var vespaModel = loadModel(Path.fromString("src/test/cfg/significance/hosted/"), true);
+
+        var cluster = vespaModel.getContainerClusters().get("container");
+        assertEquals(1, cluster.getContainers().size());
+
+        var significanceConfig = assertSignificancePresent(cluster);
         assertEquals(3, significanceConfig.model().size());
 
-        assertEquals("models/idf-norwegian-wiki.json.zst", modelReference(significanceConfig.model().get(1), "path").path().orElseThrow().value());
-        assertEquals("https://some/uri/blob.json", modelReference(significanceConfig.model().get(2), "path").url().orElseThrow().value());
 
+        assertModel(significanceConfig.model(0),
+                Optional.of("significance-en-wikipedia-v1"),
+                Optional.empty(),
+                Optional.of("https://data.vespa-cloud.com/significance_models/significance-en-wikipedia-v1.json.zst")
+        );
+
+        assertModel(significanceConfig.model(1),
+                Optional.empty(),
+                Optional.of("models/idf-norwegian-wiki.json.zst"),
+                Optional.empty()
+        );
 
+        assertModel(significanceConfig.model(2),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.of("https://some/uri/blob.json")
+        );
     }
 
-    private SignificanceConfig assertSignificancePresent(ApplicationContainerCluster cluster) {
+    private VespaModel loadModel(Path path, boolean hosted) throws Exception {
+        FilesApplicationPackage applicationPackage = FilesApplicationPackage.fromFile(path.toFile());
+        TestProperties properties = new TestProperties().setHostedVespa(hosted);
+        DeployState state = new DeployState.Builder()
+                .properties(properties)
+                .endpoints(hosted ? Set.of(new ContainerEndpoint("container", ApplicationClusterEndpoint.Scope.zone, List.of("default.example.com"))) : Set.of())
+                .applicationPackage(applicationPackage)
+                .build();
+        return new VespaModel(state);
+    }
 
+    private SignificanceConfig assertSignificancePresent(ApplicationContainerCluster cluster) {
         var id = new ComponentId("com.yahoo.language.significance.impl.DefaultSignificanceModelRegistry");
         var significance = (SignificanceModelRegistry) cluster.getComponentsMap().get(id);
         assertEquals("com.yahoo.language.significance.impl.DefaultSignificanceModelRegistry", significance.getClassId().getName());
@@ -64,5 +120,27 @@ private static ModelReference modelReference(InnerNode cfg, String name) {
             throw new RuntimeException(e);
         }
     }
+
+    void assertModel(SignificanceConfig.Model model, Optional<String> id, Optional<String> path, Optional<String> url) {
+        var modelReference = modelReference(model, "path");
+        var modelId = modelReference.modelId();
+        var modelPath = modelReference.path();
+        var modelUrl = modelReference.url();
+
+        id.ifPresentOrElse(
+                s -> assertEquals(s, modelId.orElseThrow()),
+                () -> assertEquals(Optional.empty(), modelId)
+        );
+
+        path.ifPresentOrElse(
+                s -> assertEquals(s, modelPath.orElseThrow().value()),
+                () -> assertEquals(Optional.empty(), modelPath)
+        );
+
+        url.ifPresentOrElse(
+                s -> assertEquals(s, modelUrl.orElseThrow().value()),
+                () -> assertEquals(Optional.empty(), modelUrl)
+        );
+    }
 }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 94235185f450..95ccd9593843 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -113,14 +113,7 @@
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.OptionalLong;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.UnaryOperator;
 import java.util.logging.Level;
@@ -662,21 +655,25 @@ public HttpResponse fileDistributionStatus(ApplicationId applicationId, Duration
         return fileDistributionStatus.status(getApplication(applicationId), timeout);
     }
 
-    public List<String> deleteUnusedFileDistributionReferences(FileDirectory fileDirectory, Duration keepFileReferencesDuration) {
+    public List<String> deleteUnusedFileDistributionReferences(FileDirectory fileDirectory) {
         Set<String> fileReferencesInUse = getFileReferencesInUse();
         log.log(Level.FINE, () -> "File references in use : " + fileReferencesInUse);
-        Instant instant = clock.instant().minus(keepFileReferencesDuration);
-        log.log(Level.FINE, () -> "Remove unused file references last modified before " + instant);
-
-        List<String> fileReferencesToDelete = sortedUnusedFileReferences(fileDirectory.getRoot(), fileReferencesInUse, instant);
-        // Do max 20 at a time
-        var toDelete = fileReferencesToDelete.subList(0, Math.min(fileReferencesToDelete.size(), 20));
-        if (toDelete.size() > 0) {
-            log.log(Level.FINE, () -> "Will delete file references not in use: " + toDelete);
-            toDelete.forEach(fileReference -> fileDirectory.delete(new FileReference(fileReference), this::isFileReferenceInUse));
-            log.log(Level.FINE, () -> "Deleted " + toDelete.size() + " file references not in use");
-        }
-        return toDelete;
+
+        List<String> toDelete = sortedUnusedFileReferences(fileDirectory.getRoot(), fileReferencesInUse);
+        log.log(Level.FINE, () -> "File references not in use: " + toDelete);
+        List<String> deleted = new ArrayList<>();
+        toDelete.forEach(fileReference -> {
+            if (fileDirectory.delete(new FileReference(fileReference), this::isFileReferenceInUse, this::isFileReferenceOld))
+                deleted.add(fileReference);
+        });
+        log.log(Level.FINE, () -> "Deleted " + deleted.size() + " file references not in use");
+        return deleted;
+    }
+
+    private boolean isFileReferenceOld(File file) {
+        var keepFileReferencesDuration = Duration.ofMinutes(configserverConfig.keepUnusedFileReferencesMinutes());
+        var instant = clock.instant().minus(keepFileReferencesDuration);
+        return isLastModifiedBefore(file, instant);
     }
 
     private boolean isFileReferenceInUse(FileReference fileReference) {
@@ -694,14 +691,15 @@ private Set<String> getFileReferencesInUse() {
         return fileReferencesInUse;
     }
 
-    private List<String> sortedUnusedFileReferences(File fileReferencesPath, Set<String> fileReferencesInUse, Instant instant) {
+    private List<String> sortedUnusedFileReferences(File fileReferencesPath, Set<String> fileReferencesInUse) {
         Set<String> fileReferencesOnDisk = getFileReferencesOnDisk(fileReferencesPath);
         log.log(Level.FINEST, () -> "File references on disk (in " + fileReferencesPath + "): " + fileReferencesOnDisk);
         return fileReferencesOnDisk
                 .stream()
                 .filter(fileReference -> ! fileReferencesInUse.contains(fileReference))
-                .filter(fileReference -> isLastModifiedBefore(new File(fileReferencesPath, fileReference), instant))
                 .sorted(Comparator.comparing(a -> lastModified(new File(fileReferencesPath, a))))
+                // Do max 20 at a time
+                .limit(20)
                 .toList();
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
index 5b8c6a9c1a08..18dd95042eee 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
@@ -133,12 +133,18 @@ public FileReference addFile(File source) throws IOException {
         }
     }
 
-    public void delete(FileReference fileReference, Function<FileReference, Boolean> isInUse) {
+    public boolean delete(FileReference fileReference, Function<FileReference, Boolean> isInUse, Function<File, Boolean> isOld) {
         try (Lock lock = locks.lock(fileReference)) {
             if (isInUse.apply(fileReference))
                 log.log(FINE, "Unable to delete file reference '" + fileReference.value() + "' since it is still in use");
-            else
+            else if ( ! isOld.apply(new File(getRoot(), fileReference.value())))
+                log.log(FINE, "Unable to delete file reference '" + fileReference.value() + "' since it is recently used");
+            else {
                 deleteDirRecursively(destinationDir(fileReference));
+                log.log(FINE, "Deleted file reference '" + fileReference.value() + "'");
+                return true;
+            }
+            return false;
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java
index dfd704f98bbb..3d245146ac1c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java
@@ -7,9 +7,11 @@
 import com.yahoo.container.jdisc.HttpResponse;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.core5.http.ConnectionRequestTimeoutException;
 import org.apache.hc.core5.util.Timeout;
 
 import java.io.IOException;
+import java.io.OutputStream;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Optional;
@@ -34,6 +36,8 @@ public HttpResponse getLogs(HttpURL logServerUri, Optional<Instant> deployTime)
         HttpGet get = new HttpGet(logServerUri.asURI());
         try {
             return new ProxyResponse(httpClient.execute(get));
+        } catch (ConnectionRequestTimeoutException e) {
+            return new GatewayTimeoutResponse(504);
         } catch (IOException e) {
             if (deployTime.isPresent() && Instant.now().isBefore(deployTime.get().plus(Duration.ofMinutes(5))))
                 return new EmptyResponse();
@@ -42,4 +46,17 @@ public HttpResponse getLogs(HttpURL logServerUri, Optional<Instant> deployTime)
         }
     }
 
+    private static class GatewayTimeoutResponse extends HttpResponse {
+
+        public GatewayTimeoutResponse(int status) { super(status); }
+
+        public GatewayTimeoutResponse() { this(504); }
+
+        @Override
+        public void render(OutputStream outputStream) {
+            // NOP
+        }
+
+    }
+
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java
index 4a0221fdc2cb..14c54fff1b36 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java
@@ -19,21 +19,18 @@
 public class FileDistributionMaintainer extends ConfigServerMaintainer {
 
     private final FileDirectory fileDirectory;
-    private final Duration maxUnusedFileReferenceAge;
 
     FileDistributionMaintainer(ApplicationRepository applicationRepository,
                                Curator curator,
                                Duration interval,
                                FileDirectory fileDirectory) {
         super(applicationRepository, curator, applicationRepository.flagSource(), applicationRepository.clock(), interval, false);
-        ConfigserverConfig configserverConfig = applicationRepository.configserverConfig();
-        this.maxUnusedFileReferenceAge = Duration.ofMinutes(configserverConfig.keepUnusedFileReferencesMinutes());
         this.fileDirectory = fileDirectory;
     }
 
     @Override
     protected double maintain() {
-        applicationRepository.deleteUnusedFileDistributionReferences(fileDirectory, maxUnusedFileReferenceAge);
+        applicationRepository.deleteUnusedFileDistributionReferences(fileDirectory);
         return 1.0;
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 2142d5652269..30635fd53df2 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -115,6 +115,7 @@ public void setup() throws IOException {
                 .configServerDBDir(temporaryFolder.newFolder().getAbsolutePath())
                 .configDefinitionsDir(temporaryFolder.newFolder().getAbsolutePath())
                 .fileReferencesDir(temporaryFolder.newFolder().getAbsolutePath())
+                .keepUnusedFileReferencesMinutes(1)
                 .build();
         InMemoryFlagSource flagSource = new InMemoryFlagSource();
         fileDirectory = new FileDirectory(configserverConfig);
@@ -276,7 +277,6 @@ public void getLogsForHostname() {
     @Test
     public void deleteUnusedFileReferences() {
         File fileReferencesDir = new File(configserverConfig.fileReferencesDir());
-        Duration keepFileReferencesDuration = Duration.ofSeconds(4);
 
         // Add file reference that is not in use and should be deleted (older than 'keepFileReferencesDuration')
         File filereferenceDirOldest = createFileReferenceOnDisk(new File(fileReferencesDir, "bar"));
@@ -287,7 +287,7 @@ public void deleteUnusedFileReferences() {
             createFileReferenceOnDisk(new File(fileReferencesDir, "baz" + i));
             clock.advance(Duration.ofSeconds(1));
         });
-        clock.advance(keepFileReferencesDuration);
+        clock.advance(Duration.ofMinutes(configserverConfig.keepUnusedFileReferencesMinutes()));
 
         // Add file reference that is not in use, but should not be deleted (newer than 'keepFileReferencesDuration')
         File filereferenceDirNewest = createFileReferenceOnDisk(new File(fileReferencesDir, "foo"));
@@ -296,13 +296,14 @@ public void deleteUnusedFileReferences() {
                 .withTenantRepository(tenantRepository)
                 .withOrchestrator(orchestrator)
                 .withClock(clock)
+                .withConfigserverConfig(configserverConfig)
                 .build();
 
         // TODO: Deploy an app with a bundle or file that will be a file reference, too much missing in test setup to get this working now
         // PrepareParams prepareParams = new PrepareParams.Builder().applicationId(applicationId()).ignoreValidationErrors(true).build();
         // deployApp(new File("src/test/apps/app"), prepareParams);
 
-        List<String> deleted = applicationRepository.deleteUnusedFileDistributionReferences(fileDirectory, keepFileReferencesDuration);
+        List<String> deleted = applicationRepository.deleteUnusedFileDistributionReferences(fileDirectory);
         List<String> expected = List.of("bar", "baz0", "baz1");
         assertEquals(expected.stream().sorted().toList(), deleted.stream().sorted().toList());
         // bar, baz0 and baz1 will be deleted and foo is not old enough to be considered
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/MockLogRetriever.java b/configserver/src/test/java/com/yahoo/vespa/config/server/MockLogRetriever.java
index 4d085dddd82d..13392fc7b3dd 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/MockLogRetriever.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/MockLogRetriever.java
@@ -16,12 +16,22 @@
  */
 public class MockLogRetriever extends LogRetriever {
 
+    private final int statuCode;
+    private final String logLine;
+
+    public MockLogRetriever() { this(200, "log line"); }
+
+    public MockLogRetriever(int statusCode, String logLine) {
+        this.statuCode = statusCode;
+        this.logLine = logLine;
+    }
+
     @Override
     public HttpResponse getLogs(HttpURL logServerUri, Optional<Instant> deployTime) {
-        return new HttpResponse(200) {
+        return new HttpResponse(statuCode) {
             @Override
             public void render(OutputStream outputStream) throws IOException {
-                outputStream.write("log line".getBytes(StandardCharsets.UTF_8));
+                outputStream.write(logLine.getBytes(StandardCharsets.UTF_8));
             }
         };
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployNodeAllocationTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployNodeAllocationTest.java
index 675acf807041..0fbb143d6731 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployNodeAllocationTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployNodeAllocationTest.java
@@ -83,7 +83,7 @@ public void testExceedsQuota() {
                     .quota(new Quota(Optional.of(4), Optional.of(valueOf(0)))));
             fail("Expected to get a QuotaExceededException");
         } catch (QuotaExceededException e) {
-            assertEquals("main: The resources used cost $1.02 but your quota is $0.00: Contact support to upgrade your plan.", e.getMessage());
+            assertEquals("main: The resources used cost $1.02 but your remaining quota is $0.00: Contact support to upgrade your plan.", e.getMessage());
         }
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
index fe573ab5c2f2..58658afcb6f9 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
@@ -108,7 +108,7 @@ public class ApplicationHandlerTest {
     private final static ApplicationId myTenantApplicationId = ApplicationId.from(mytenantName, ApplicationName.defaultName(), InstanceName.defaultName());
     private final static ApplicationId applicationId = ApplicationId.defaultId();
     private final static MockTesterClient testerClient = new MockTesterClient();
-    private static final MockLogRetriever logRetriever = new MockLogRetriever();
+    private MockLogRetriever logRetriever = new MockLogRetriever();
     private static final Version vespaVersion = Version.fromString("7.8.9");
     private static final SecretStoreValidator secretStoreValidator = new MockSecretStoreValidator();
 
@@ -462,6 +462,20 @@ public void testGetLogs() throws IOException {
         assertEquals("log line", getRenderedString(response));
     }
 
+    @Test
+    public void testGetLogsConnectionTimeout() throws IOException {
+        logRetriever = new MockLogRetriever(504, "Connection error when getting logs");
+        setup();
+        applicationRepository.deploy(new File("src/test/apps/app-logserver-with-container"), prepareParams(applicationId));
+        String url = toUrlPath(applicationId, Zone.defaultZone(), true) + "/logs?from=100&to=200";
+        ApplicationHandler mockHandler = createApplicationHandler();
+
+        HttpResponse response = mockHandler.handle(createTestRequest(url, GET));
+        assertEquals(504, response.getStatus());
+
+        assertEquals("Connection error when getting logs", getRenderedString(response));
+    }
+
     @Test
     public void testValidateSecretStore() throws IOException {
         applicationRepository.deploy(new File("src/test/apps/app-logserver-with-container"), prepareParams(applicationId));
diff --git a/container-core/src/main/java/com/yahoo/restapi/ErrorResponse.java b/container-core/src/main/java/com/yahoo/restapi/ErrorResponse.java
index 2f329524c2b7..8050f6afd848 100644
--- a/container-core/src/main/java/com/yahoo/restapi/ErrorResponse.java
+++ b/container-core/src/main/java/com/yahoo/restapi/ErrorResponse.java
@@ -7,6 +7,7 @@
 import static com.yahoo.jdisc.Response.Status.BAD_REQUEST;
 import static com.yahoo.jdisc.Response.Status.CONFLICT;
 import static com.yahoo.jdisc.Response.Status.FORBIDDEN;
+import static com.yahoo.jdisc.Response.Status.GATEWAY_TIMEOUT;
 import static com.yahoo.jdisc.Response.Status.INTERNAL_SERVER_ERROR;
 import static com.yahoo.jdisc.Response.Status.METHOD_NOT_ALLOWED;
 import static com.yahoo.jdisc.Response.Status.NOT_FOUND;
@@ -25,6 +26,7 @@ public enum errorCodes {
         FORBIDDEN,
         METHOD_NOT_ALLOWED,
         INTERNAL_SERVER_ERROR,
+        GATEWAY_TIMEOUT,
         UNAUTHORIZED,
         CONFLICT
     }
@@ -49,6 +51,10 @@ public static ErrorResponse internalServerError(String message) {
         return new ErrorResponse(INTERNAL_SERVER_ERROR, errorCodes.INTERNAL_SERVER_ERROR.name(), message);
     }
 
+    public static ErrorResponse gatewayTimeout(String message) {
+        return new ErrorResponse(GATEWAY_TIMEOUT, errorCodes.GATEWAY_TIMEOUT.name(), message);
+    }
+
     public static ErrorResponse badRequest(String message) {
         return new ErrorResponse(BAD_REQUEST, errorCodes.BAD_REQUEST.name(), message);
     }
diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiException.java b/container-core/src/main/java/com/yahoo/restapi/RestApiException.java
index 3a44bc4da5fd..51964d5fc755 100644
--- a/container-core/src/main/java/com/yahoo/restapi/RestApiException.java
+++ b/container-core/src/main/java/com/yahoo/restapi/RestApiException.java
@@ -69,6 +69,11 @@ public static class InternalServerError extends RestApiException {
         public InternalServerError(String message, Throwable cause) { super(ErrorResponse::internalServerError, message, cause); }
     }
 
+    public static class GatewayTimeout extends RestApiException {
+        public GatewayTimeout(String message) { this(message, null); }
+        public GatewayTimeout(String message, Throwable cause) { super(ErrorResponse::gatewayTimeout, message, cause); }
+    }
+
     public static class Forbidden extends RestApiException {
         public Forbidden() { this("Forbidden"); }
         public Forbidden(String message) { super(ErrorResponse::forbidden, message, null); }
diff --git a/container-disc/src/main/java/ai/vespa/secret/model/Role.java b/container-disc/src/main/java/ai/vespa/secret/model/Role.java
index 8d8e3baf2dcb..340499abb27b 100644
--- a/container-disc/src/main/java/ai/vespa/secret/model/Role.java
+++ b/container-disc/src/main/java/ai/vespa/secret/model/Role.java
@@ -19,13 +19,6 @@ public String value() {
         return value;
     }
 
-    public String forVault(VaultName vault) {
-        return switch(this) {
-            case WRITER, READER -> vault.value() + "-" + value;
-            case TENANT_SECRET_WRITER -> value;
-        };
-    }
-
     @Override
     public String toString() {
         return Role.class.getSimpleName() + "." + value;
diff --git a/container-disc/src/main/resources/configdefinitions/asm-secret.def b/container-disc/src/main/resources/configdefinitions/asm-secret.def
index 3b29b603af4b..268060131aea 100644
--- a/container-disc/src/main/resources/configdefinitions/asm-secret.def
+++ b/container-disc/src/main/resources/configdefinitions/asm-secret.def
@@ -1,6 +1,11 @@
-# Config for AsmSecretStore
+# Config for ASM secret readers
 
 package=ai.vespa.secret.config.aws
 
 ztsUri string
 athenzDomain string default=""
+
+# TODO: move to a separaet config (and remove defaults). Only used by AsmTenantSecretReader
+# Used to create the athenz role name when retrieving secrets on behalf of a tenant
+tenant string default=""
+system string default=""
diff --git a/container-search/src/main/java/ai/vespa/search/llm/LLMSearcher.java b/container-search/src/main/java/ai/vespa/search/llm/LLMSearcher.java
index 3ec40fc9e1cb..2bc74ef70a00 100755
--- a/container-search/src/main/java/ai/vespa/search/llm/LLMSearcher.java
+++ b/container-search/src/main/java/ai/vespa/search/llm/LLMSearcher.java
@@ -279,10 +279,11 @@ void onCompletion() {
         }
 
         String report() {
+            long generationTime = timeToLastToken - timeToFirstToken;
             return "Time to first token: " + timeToFirstToken + " ms, " +
-                   "Generation time: " + timeToLastToken + " ms, " +
+                   "Generation time: " + generationTime + " ms, " +
                    "Generated tokens: " + tokens + " " +
-                   String.format("(%.2f tokens/sec)", tokens / (timeToLastToken / 1000.0));
+                   String.format("(%.2f tokens/sec)", tokens / (generationTime / 1000.0));
         }
 
     }
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/CoverageAggregator.java b/container-search/src/main/java/com/yahoo/search/dispatch/CoverageAggregator.java
index f22dc3f3c5d0..21c3b0ce94d2 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/CoverageAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/CoverageAggregator.java
@@ -86,7 +86,9 @@ public CoverageAggregator adjustedDegradedCoverage(int redundancy, TimeoutHandle
                 if (missingNodes > 0) {
                     clone.adjustActiveDocs(missingNodes);
                 }
-                clone.timedOut = true;
+                if (timeoutHandler.reason() == DEGRADED_BY_TIMEOUT) {
+                    clone.timedOut = true;
+                }
                 return clone;
             }
         }
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
index 933a673c1bc8..6528c5d2ae40 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
@@ -6,18 +6,12 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Logger;
-
-import static java.util.logging.Level.FINE;
 
 /**
  * @author baldersheim
  */
 public class SearchGroupsImpl implements SearchGroups {
 
-    private static final Logger log = Logger.getLogger(SearchGroupsImpl.class.getName());
-
-
     private final Map<Integer, Group> groups;
     private final double minActiveDocsPercentage;
 
@@ -41,8 +35,6 @@ public boolean isPartialGroupCoverageSufficient(boolean currentIsGroupCoverageSu
 
     public boolean isGroupCoverageSufficient(boolean currentIsGroupCoverageSufficient,
                                              long groupDocumentCount, long medianDocumentCount, long maxDocumentCount) {
-        log.log(FINE, () -> String.format("Group doc count: %d, max doc count: %d, median: %d, minActiveDocsPercentage: %.2f",
-                                          groupDocumentCount, maxDocumentCount, medianDocumentCount, minActiveDocsPercentage));
         if (medianDocumentCount <= 0) return true;
         if (currentIsGroupCoverageSufficient) {
             // To take a group *out of* rotation, require that it has less active documents than the median.
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/UniqueGroupingSearcher.java b/container-search/src/main/java/com/yahoo/search/grouping/UniqueGroupingSearcher.java
index e319740f7416..ad6205a80506 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/UniqueGroupingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/UniqueGroupingSearcher.java
@@ -149,7 +149,7 @@ private static List<GroupingExpression> createHitOrderingClause(Sorting sortingS
                 case DESCENDING ->
                     // When we sort in descending order, the hit with the largest value should come first (and be surfaced).
                         orderingClause.add(new NegFunction(new MaxAggregator(new AttributeValue(fieldOrder.getFieldName()))));
-                default -> throw new UnsupportedOperationException("Can not handle sort order " + sortOrder + ".");
+                default -> throw new IllegalStateException("Can not handle sort order " + sortOrder + ".");
             }
         }
         return orderingClause;
@@ -170,7 +170,7 @@ private static GroupingExpression createGroupOrderingClause(Sorting sortingSpec)
                 case DESCENDING ->
                     // To sort descending, just take the negative. This is the most common case
                         new NegFunction(new AttributeValue(fieldOrder.getFieldName()));
-                default -> throw new UnsupportedOperationException("Can not handle sort order " + sortOrder + ".");
+                default -> throw new IllegalStateException("Can not handle sort order " + sortOrder + ".");
             };
         }
         return groupingClause;
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/TimeFunctions.java b/container-search/src/main/java/com/yahoo/search/grouping/request/TimeFunctions.java
index 577ac72a56bd..11bdc19f23bb 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/TimeFunctions.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/TimeFunctions.java
@@ -1,6 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.request;
 
+import com.yahoo.processing.IllegalInputException;
+
 /**
  * This abstract class is a factory for timestamp functions in a {@link GroupingExpression}. Apart from offering
  * per-function factory methods, this class also contains a {@link #newInstance(com.yahoo.search.grouping.request.TimeFunctions.Type,
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ExpressionConverter.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ExpressionConverter.java
index c967f9ca1fb3..9fb6bcb7fda5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ExpressionConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ExpressionConverter.java
@@ -1,6 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.vespa;
 
+import com.yahoo.processing.IllegalInputException;
 import com.yahoo.search.grouping.request.AddFunction;
 import com.yahoo.search.grouping.request.AggregatorNode;
 import com.yahoo.search.grouping.request.AndFunction;
@@ -206,7 +207,7 @@ public AggregationResult toAggregationResult(GroupingExpression exp) {
             if (exp instanceof CountAggregator) {
                 return new ExpressionCountAggregationResult();
             }
-            throw new UnsupportedOperationException(
+            throw new IllegalInputException(
                     "Can not aggregate on " + GroupingOperation.getLevelDesc(level) + ".");
         }
         if (exp instanceof AvgAggregator) {
@@ -243,7 +244,7 @@ public AggregationResult toAggregationResult(GroupingExpression exp) {
             return new XorAggregationResult()
                     .setExpression(toExpressionNode(((XorAggregator)exp).getExpression()));
         }
-        throw new UnsupportedOperationException("Can not convert '" + exp + "' to an aggregator.");
+        throw new IllegalInputException("Can not convert '" + exp + "' to an aggregator.");
     }
 
     /**
@@ -251,7 +252,7 @@ public AggregationResult toAggregationResult(GroupingExpression exp) {
      *
      * @param exp The expression to convert.
      * @return The corresponding back-end expression.
-     * @throws UnsupportedOperationException Thrown if the given expression could not be converted.
+     * @throws IllegalInputException Thrown if the given expression could not be converted.
      */
     public ExpressionNode toExpressionNode(GroupingExpression exp) {
         if (exp instanceof AddFunction) {
@@ -520,8 +521,8 @@ public ExpressionNode toExpressionNode(GroupingExpression exp) {
             return new XorBitFunctionNode().setNumBits(((XorBitFunction)exp).getNumBits())
                                            .addArg(toExpressionNode(((XorBitFunction)exp).getArg(0)));
         }
-        throw new UnsupportedOperationException("Can not convert '" + exp + "' of class " + exp.getClass().getName() +
-                                                " to an expression.");
+        throw new IllegalInputException("Can not convert '" + exp + "' of class " + exp.getClass().getName() +
+                                        " to an expression.");
     }
 
     private TimeStampFunctionNode toTime(GroupingExpression arg, TimeStampFunctionNode.TimePart timePart) {
@@ -576,7 +577,7 @@ private ResultNodeVector toBucketList(PredefinedFunction fnc) {
 
     private BucketResultNode toBucket(GroupingExpression exp) {
         if (!(exp instanceof BucketValue)) {
-            throw new UnsupportedOperationException("Can not convert '" + exp + "' to a bucket.");
+            throw new IllegalInputException("Can not convert '" + exp + "' to a bucket.");
         }
         ConstantValue<?> begin = ((BucketValue)exp).getFrom();
         ConstantValue<?> end = ((BucketValue)exp).getTo();
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingTransform.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingTransform.java
index cac544d63abd..47b332feee0c 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingTransform.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingTransform.java
@@ -1,6 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.vespa;
 
+import com.yahoo.processing.IllegalInputException;
 import com.yahoo.search.grouping.Continuation;
 
 import java.util.HashMap;
@@ -90,8 +91,8 @@ public GroupingTransform putLabel(int parentTag, int tag, String label, String t
         } else {
             for (Integer sibling : siblings) {
                 if (label.equals(labels.get(sibling))) {
-                    throw new UnsupportedOperationException("Can not use " + type + " label '" + label +
-                                                            "' for multiple siblings.");
+                    throw new IllegalInputException("Can not use " + type + " label '" + label +
+                                                    "' for multiple siblings.");
                 }
             }
         }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/RequestBuilder.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/RequestBuilder.java
index 73b68ebff7ba..0aa5d315c687 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/RequestBuilder.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/RequestBuilder.java
@@ -116,7 +116,7 @@ public List<Grouping> getRequestList() {
      * This method might fail due to unsupported constructs in the request, in which case an exception is thrown.
      *
      * @throws IllegalStateException         If this method is called more than once.
-     * @throws UnsupportedOperationException If the grouping request contains unsupported constructs.
+     * @throws IllegalInputException If the grouping request contains unsupported constructs.
      */
     public void build() {
         if (tag != 0) {
@@ -173,7 +173,7 @@ OptionalLong totalGroupsAndSummaries() {
     private void processRequestNode(BuildFrame frame) {
         int level = frame.astNode.getLevel();
         if (level > 2) {
-            throw new UnsupportedOperationException("Can not operate on " +
+            throw new IllegalInputException("Can not operate on " +
                                                     GroupingOperation.getLevelDesc(level) + ".");
         }
         if (frame.astNode instanceof EachOperation) {
@@ -243,7 +243,7 @@ private void resolveGroupBy(BuildFrame frame) {
         GroupingExpression exp = frame.astNode.getGroupBy();
         if (exp != null) {
             if (frame.state.groupBy != null) {
-                throw new UnsupportedOperationException("Can not group list of groups.");
+                throw new IllegalInputException("Can not group list of groups.");
             }
             frame.state.groupBy = converter.toExpressionNode(exp);
             frame.state.label = exp.toString(); // label for next each()
@@ -255,7 +255,7 @@ private void resolveGroupBy(BuildFrame frame) {
             } else if (level == 1) {
                 frame.state.label = "hits"; // next each() is hitlist
             } else {
-                throw new UnsupportedOperationException("Can not create anonymous " +
+                throw new IllegalInputException("Can not create anonymous " +
                                                         GroupingOperation.getLevelDesc(level) + ".");
             }
         }
@@ -289,7 +289,7 @@ private void resolveOrderBy(BuildFrame frame) {
         }
         int reqLevel = frame.astNode.getLevel();
         if (reqLevel != 2) {
-            throw new UnsupportedOperationException(
+            throw new IllegalInputException(
                     "Can not order " + GroupingOperation.getLevelDesc(reqLevel) + " content.");
         }
         for (GroupingExpression exp : lst) {
@@ -321,7 +321,7 @@ private AggregationResult toAggregationResult(GroupingExpression exp, Group grou
         String label = exp.getLabel();
         if (result instanceof HitsAggregationResult hits) {
             if (label != null) {
-                throw new UnsupportedOperationException("Can not label expression '" + exp + "'.");
+                throw new IllegalInputException("Can not label expression '" + exp + "'.");
             }
             if (frame.state.max != null) {
                 transform.putMax(tag, frame.state.max, "hit list");
@@ -349,7 +349,7 @@ private void resolveWhere(BuildFrame frame) {
         String where = frame.astNode.getWhere();
         if (where != null) {
             if (!isRootOperation(frame)) {
-                throw new UnsupportedOperationException("Can not apply 'where' to non-root group.");
+                throw new IllegalInputException("Can not apply 'where' to non-root group.");
             }
             switch (where) {
             case "true":
@@ -359,7 +359,7 @@ private void resolveWhere(BuildFrame frame) {
                 // ignore
                 break;
             default:
-                throw new UnsupportedOperationException("Operation 'where' does not support '" + where + "'.");
+                throw new IllegalInputException("Operation 'where' does not support '" + where + "'.");
             }
         }
     }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java
index e8b6d4f72aab..a78dcc4ec21d 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java
@@ -2,6 +2,7 @@
 package com.yahoo.search.grouping.vespa;
 
 import com.yahoo.prelude.hitfield.RawBase64;
+import com.yahoo.processing.IllegalInputException;
 import com.yahoo.search.grouping.Continuation;
 import com.yahoo.search.grouping.GroupingRequest;
 import com.yahoo.search.grouping.result.BoolId;
@@ -134,12 +135,12 @@ public Continuation getContinuation() {
      * Constructs the grouping result tree that corresponds to the parameters given to this builder. This method might
      * fail due to unsupported constructs in the results, in which case an exception is thrown.
      *
-     * @throws UnsupportedOperationException Thrown if the grouping result contains unsupported constructs.
+     * @throws IllegalInputException Thrown if the grouping result contains unsupported constructs.
      */
     public void build() {
         int numChildren = rootBuilder.childGroups.size();
         if (numChildren != 1) {
-            throw new UnsupportedOperationException("Expected 1 group, got " + numChildren + ".");
+            throw new IllegalInputException("Expected 1 group, got " + numChildren + ".");
         }
         rootBuilder.childGroups.get(0).fill(root);
     }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java
index fff992583092..21c1e8c7b149 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java
@@ -9,6 +9,7 @@
 import com.yahoo.prelude.fastsearch.FastHit;
 import com.yahoo.prelude.fastsearch.GroupingListHit;
 import com.yahoo.prelude.query.NullItem;
+import com.yahoo.processing.IllegalInputException;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
@@ -122,7 +123,7 @@ void requireThatAggregationPerHitWithoutGroupingDoesNotWorkYet() {
         try {
             execute("each(output(strlen(customer)))");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (IllegalInputException e) {
 
         }
     }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java
index 7dd4416163f9..77036fd0ffa6 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java
@@ -1,6 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.vespa;
 
+import com.yahoo.processing.IllegalInputException;
 import com.yahoo.search.grouping.Continuation;
 import org.junit.jupiter.api.Test;
 
@@ -40,7 +41,7 @@ void requireThatLabelIsUniqueAmongSiblings() {
         try {
             transform.putLabel(0, 2, "foo", "my_type");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (IllegalInputException e) {
             assertEquals("Can not use my_type label 'foo' for multiple siblings.",
                     e.getMessage());
         }
diff --git a/container-search/src/test/java/com/yahoo/search/significance/test/SignificanceSearcherTest.java b/container-search/src/test/java/com/yahoo/search/significance/test/SignificanceSearcherTest.java
index e33cf9d958fc..b812817064ca 100644
--- a/container-search/src/test/java/com/yahoo/search/significance/test/SignificanceSearcherTest.java
+++ b/container-search/src/test/java/com/yahoo/search/significance/test/SignificanceSearcherTest.java
@@ -536,4 +536,4 @@ public void testQueryWithDocumentFrequencyAndSignificance() {
         var resultSignificance = firstWord.getSignificance();
         assertEquals(querySignificance.get(), resultSignificance);
     }
-}
\ No newline at end of file
+}
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index fb13d4706e0a..eb5cc01f3762 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -110,7 +110,7 @@
         <java-jwt.vespa.version>4.4.0</java-jwt.vespa.version>
         <javax.annotation.vespa.version>1.2</javax.annotation.vespa.version>
         <jaxb.runtime.vespa.version>4.0.5</jaxb.runtime.vespa.version>
-        <jetty.vespa.version>11.0.22</jetty.vespa.version>
+        <jetty.vespa.version>11.0.24</jetty.vespa.version>
         <jetty-servlet-api.vespa.version>5.0.2</jetty-servlet-api.vespa.version>
         <jieba.vespa.version>1.0.2</jieba.vespa.version>
         <jimfs.vespa.version>1.3.0</jimfs.vespa.version>
@@ -142,7 +142,7 @@
         <plexus-utils.vespa.version>4.0.1</plexus-utils.vespa.version>
         <plexus-xml.vespa.version>4.0.4</plexus-xml.vespa.version>
         <plexus-classworlds.vespa.version>2.8.0</plexus-classworlds.vespa.version>
-        <protobuf.vespa.version>3.25.4</protobuf.vespa.version>
+        <protobuf.vespa.version>3.25.5</protobuf.vespa.version>
         <questdb.vespa.version>7.4.2</questdb.vespa.version>
         <spifly.vespa.version>1.3.7</spifly.vespa.version>
         <snappy.vespa.version>1.1.10.6</snappy.vespa.version>
diff --git a/document/abi-spec.json b/document/abi-spec.json
index 89c0e4e27196..ba2313dcf0b1 100644
--- a/document/abi-spec.json
+++ b/document/abi-spec.json
@@ -200,6 +200,7 @@
       "public int getCode()",
       "public com.yahoo.document.FieldPath buildFieldPath(java.lang.String)",
       "public com.yahoo.document.PrimitiveDataType getPrimitiveType()",
+      "public com.yahoo.document.DataType getNestedType()",
       "public void visitMembers(com.yahoo.vespa.objects.ObjectVisitor)",
       "public int compareTo(com.yahoo.document.DataType)",
       "public boolean isMultivalue()",
diff --git a/document/src/main/java/com/yahoo/document/ArrayDataType.java b/document/src/main/java/com/yahoo/document/ArrayDataType.java
index b14e6cd8a424..05b578f74457 100644
--- a/document/src/main/java/com/yahoo/document/ArrayDataType.java
+++ b/document/src/main/java/com/yahoo/document/ArrayDataType.java
@@ -24,10 +24,12 @@ public ArrayDataType(DataType nestedType, int code) {
         super("Array<"+nestedType.getName()+">", code, nestedType);
     }
 
+    @Override
     public ArrayDataType clone() {
         return (ArrayDataType) super.clone();
     }
 
+    @Override
     public Array createFieldValue() {
         return new Array(this);
     }
diff --git a/document/src/main/java/com/yahoo/document/CollectionDataType.java b/document/src/main/java/com/yahoo/document/CollectionDataType.java
index d580e27d4371..98be8d4709f5 100644
--- a/document/src/main/java/com/yahoo/document/CollectionDataType.java
+++ b/document/src/main/java/com/yahoo/document/CollectionDataType.java
@@ -33,9 +33,8 @@ public CollectionDataType clone() {
         return type;
     }
 
-    public DataType getNestedType() {
-        return nestedType;
-    }
+    @Override
+    public DataType getNestedType() { return nestedType; }
 
     @Override
     protected FieldValue createByReflection(Object arg) { return null; }
diff --git a/document/src/main/java/com/yahoo/document/DataType.java b/document/src/main/java/com/yahoo/document/DataType.java
index 64bd462fb34d..7a49938334fa 100644
--- a/document/src/main/java/com/yahoo/document/DataType.java
+++ b/document/src/main/java/com/yahoo/document/DataType.java
@@ -291,9 +291,10 @@ public FieldPath buildFieldPath(String fieldPathString) {
      *
      * @return primitive data type, or null
      */
-    public PrimitiveDataType getPrimitiveType() {
-        return null;
-    }
+    public PrimitiveDataType getPrimitiveType() { return null; }
+
+    /** Returns the nested type of this if it is a collection type, null otherwise. */
+    public DataType getNestedType() { return null; }
 
     @Override
     public void visitMembers(ObjectVisitor visitor) {
diff --git a/eval/src/apps/eval_expr/eval_expr.cpp b/eval/src/apps/eval_expr/eval_expr.cpp
index b66d77cbb5f6..1b7dcb3f7729 100644
--- a/eval/src/apps/eval_expr/eval_expr.cpp
+++ b/eval/src/apps/eval_expr/eval_expr.cpp
@@ -31,6 +31,8 @@ using vespalib::Slime;
 using vespalib::slime::JsonFormat;
 using vespalib::slime::Inspector;
 using vespalib::slime::Cursor;
+using vespalib::Input;
+using vespalib::Memory;
 
 using CostProfile = std::vector<std::pair<size_t,vespalib::duration>>;
 
@@ -157,20 +159,21 @@ class Context
     const CTFMetaData &meta() const { return _meta; }
     const CostProfile &cost() const { return _cost; }
 
-    void save(const std::string &name, Value::UP value) {
+    bool save(const std::string &name, Value::UP value) {
         REQUIRE(value);
         for (size_t i = 0; i < _param_names.size(); ++i) {
             if (_param_names[i] == name) {
                 _param_types[i] = value->type();
                 _param_values[i] = std::move(value);
                 _param_refs[i] = *_param_values[i];
-                return;
+                return true;
             }
         }
         _param_names.push_back(name);
         _param_types.push_back(value->type());
         _param_values.push_back(std::move(value));
         _param_refs.emplace_back(*_param_values.back());
+        return false;
     }
 
     bool remove(const std::string &name) {
@@ -247,24 +250,92 @@ void handle_message(Context &ctx, const Inspector &req, Cursor &reply) {
     }
 }
 
-bool should_ignore(const std::string &str) {
+bool is_hash_bang(const std::string &str) {
+    if (str.size() > 2) {
+        return str[0] == '#' && str[1] == '!';
+    }
+    return false;
+}
+
+bool is_only_whitespace(const std::string &str) {
     for (auto c : str) {
         if (!std::isspace(static_cast<unsigned char>(c))) {
-            return (c == '#');
+            return false;
         }
     }
     return true;
 }
 
-struct Script {
-    vespalib::MappedFileInput input;
-    LineReader reader;
-    Script(const std::string &file_name)
-      : input(file_name), reader(input)
-    {
-        if (!input.valid()) {
+class Script {
+private:
+    std::unique_ptr<Input> _input;
+    LineReader _reader;
+    bool _script_only = false;
+public:
+    Script(std::unique_ptr<Input> input)
+      : _input(std::move(input)), _reader(*_input) {}
+    static auto empty() {
+        struct EmptyInput : Input {
+            Memory obtain() override { return Memory(); }
+            Input &evict(size_t) override { return *this; }
+        };
+        return std::make_unique<Script>(std::make_unique<EmptyInput>());
+    }
+    static auto from_file(const std::string &file_name) {
+        auto input = std::make_unique<vespalib::MappedFileInput>(file_name);
+        if (!input->valid()) {
             fprintf(stderr, "warning: could not read script: %s\n", file_name.c_str());
         }
+        return std::make_unique<Script>(std::move(input));
+    }
+    Script &script_only(bool value) {
+        _script_only = value;
+        return *this;
+    }
+    bool script_only() const { return _script_only; }
+    bool read_line(std::string &line) { return _reader.read_line(line); }
+};
+
+class Collector {
+private:
+    Slime _slime;
+    Cursor &_obj;
+    Cursor &_arr;
+    bool _enabled;
+    std::string _error;
+public:
+    Collector()
+      : _slime(), _obj(_slime.setObject()), _arr(_obj.setArray("f")), _enabled(false) {}
+    void enable() {
+        _enabled = true;
+    }
+    void fail(const std::string &msg) {
+        if (_error.empty()) {
+            _error = msg;
+        }
+    }
+    const std::string &error() const {
+        return _error;
+    }
+    void comment(const std::string &text) {
+        if (_enabled) {
+            Cursor &f = _arr.addObject();
+            f.setString("op", "c");
+            Cursor &p = f.setObject("p");
+            p.setString("t", text);
+        }
+    }
+    void expr(const std::string &name, const std::string &expr) {
+        if (_enabled) {
+            Cursor &f = _arr.addObject();
+            f.setString("op", "e");
+            Cursor &p = f.setObject("p");
+            p.setString("n", name);
+            p.setString("e", expr);
+        }
+    }
+    std::string toString() const {
+        return _slime.toString();
     }
 };
 
@@ -272,13 +343,13 @@ struct EditLineWrapper {
     EditLine *my_el;
     History *my_hist;
     HistEvent ignore;
-    std::unique_ptr<Script> script;
+    Script &script;
     static std::string prompt;
     static char *prompt_fun(EditLine *) { return &prompt[0]; }
-    EditLineWrapper(std::unique_ptr<Script> script_in)
+    EditLineWrapper(Script &script_in)
       : my_el(el_init("vespa-eval-expr", stdin, stdout, stderr)),
         my_hist(history_init()),
-        script(std::move(script_in))
+        script(script_in)
     {
         memset(&ignore, 0, sizeof(ignore));
         el_set(my_el, EL_EDITOR, "emacs");
@@ -287,37 +358,26 @@ struct EditLineWrapper {
         el_set(my_el, EL_HIST, history, my_hist);
     }
     ~EditLineWrapper();
-    bool read_from_script(std::string &line_out) {
-        if (!script) {
-            return false;
-        }
-        if (!script->reader.read_line(line_out)) {
-            script.reset();
-            return false;
-        }
-        return true;
-    }
-    bool read_from_user(std::string &line_out) {
-        int line_len = 0;
-        const char *line = el_gets(my_el, &line_len);
-        if (line == nullptr) {
-            return false;
-        }
-        line_out.assign(line, line_len);
-        return true;
-    }
     bool read_line(std::string &line_out) {
+        bool from_script = false;
         do {
-            if (!read_from_script(line_out)) {
-                if (!read_from_user(line_out)) {
+            from_script = script.read_line(line_out);
+            if (!from_script) {
+                if (script.script_only()) {
+                    return false;
+                }
+                int line_len = 0;
+                const char *line = el_gets(my_el, &line_len);
+                if (line == nullptr) {
                     return false;
                 }
+                line_out.assign(line, line_len);
             }
             if ((line_out.size() > 0) && (line_out[line_out.size() - 1] == '\n')) {
                 line_out.pop_back();
             }
-        } while (should_ignore(line_out));
-        if (script) {
+        } while (is_hash_bang(line_out) || is_only_whitespace(line_out));
+        if (from_script) {
             fprintf(stdout, "%s%s\n", prompt.c_str(), line_out.c_str());
         }
         history(my_hist, &ignore, H_ENTER, line_out.c_str());
@@ -338,9 +398,10 @@ const std::string list_cmd("list");
 const std::string verbose_cmd("verbose ");
 const std::string def_cmd("def ");
 const std::string undef_cmd("undef ");
+const std::string ignore_cmd("#");
 
-int interactive_mode(Context &ctx, std::unique_ptr<Script> script) {
-    EditLineWrapper input(std::move(script));
+int interactive_mode(Context &ctx, Script &script, Collector &collector) {
+    EditLineWrapper input(script);
     std::string line;
     while (input.read_line(line)) {
         if (line == exit_cmd) {
@@ -356,6 +417,10 @@ int interactive_mode(Context &ctx, std::unique_ptr<Script> script) {
             }
             continue;
         }
+        if (line.find(ignore_cmd) == 0) {
+            collector.comment(line.substr(ignore_cmd.size()));
+            continue;
+        }
         if (line.find(verbose_cmd) == 0) {
             auto flag_str = line.substr(verbose_cmd.size());
             bool flag = (flag_str == "true");
@@ -376,6 +441,7 @@ int interactive_mode(Context &ctx, std::unique_ptr<Script> script) {
             } else {
                 fprintf(stdout, "value not found: '%s'\n", name.c_str());
             }
+            collector.fail("undef operation not supported");
             continue;
         }
         std::string expr;
@@ -394,12 +460,16 @@ int interactive_mode(Context &ctx, std::unique_ptr<Script> script) {
                 fprintf(stderr, " -> '%s'\n", name.c_str());
             }
         }
+        collector.expr(name, expr);
         if (auto value = ctx.eval(expr)) {
             print_value(*value, name, ctx.meta(), ctx.cost());
             if (!name.empty()) {
-                ctx.save(name, std::move(value));
+                if (ctx.save(name, std::move(value))) {
+                    collector.fail("value redefinition not supported");
+                }
             }
         } else {
+            collector.fail("sub-expression evaluation failed");
             print_error(ctx.error());
         }
     }
@@ -444,11 +514,29 @@ int main(int argc, char **argv) {
     Context ctx;
     if ((expr_cnt == 1) && (std::string(argv[expr_idx]) == "interactive")) {
         setlocale(LC_ALL, "");
-        return interactive_mode(ctx, nullptr);
+        Collector ignored;
+        return interactive_mode(ctx, *Script::empty(), ignored);
     }
     if ((expr_cnt == 2) && (std::string(argv[expr_idx]) == "interactive")) {
         setlocale(LC_ALL, "");
-        return interactive_mode(ctx, std::make_unique<Script>(argv[expr_idx + 1]));
+        Collector ignored;
+        return interactive_mode(ctx, *Script::from_file(argv[expr_idx + 1]), ignored);
+    }
+    if ((expr_cnt == 3) &&
+        (std::string(argv[expr_idx]) == "interactive") &&
+        (std::string(argv[expr_idx + 2]) == "convert"))
+    {
+        setlocale(LC_ALL, "");
+        Collector collector;
+        collector.enable();
+        interactive_mode(ctx, Script::from_file(argv[expr_idx + 1])->script_only(true), collector);
+        if (collector.error().empty()) {
+            fprintf(stdout, "%s\n", collector.toString().c_str());
+            return 0;
+        } else {
+            fprintf(stderr, "conversion failed: %s\n", collector.error().c_str());
+            return 3;
+        }
     }
     if ((expr_cnt == 1) && (std::string(argv[expr_idx]) == "json-repl")) {
         return json_repl_mode(ctx);
diff --git a/eval/src/apps/eval_expr/mapped_filters_example b/eval/src/apps/eval_expr/mapped_filters_example
index 460ea0e89343..51b1b2b61825 100755
--- a/eval/src/apps/eval_expr/mapped_filters_example
+++ b/eval/src/apps/eval_expr/mapped_filters_example
@@ -1,16 +1,15 @@
 #!/bin/env -S vespa-eval-expr interactive
 
-# This example shows how we can use a separate filter for each mapped
-# dimension in order to select a subset of dense subspaces from a
-# mixed tensor. Note that doing this will be somewhat expensive.
-
-# The 't1' tensor is typically stored in the document. The filter
-# parameters are sent with the query. Not sending a filter will leave
-# it empty, which means it will apply no filtering.
-
+# the data we are searching
 def t1 tensor<float>(a{},b{},x[2]):{a1:{b1:[1,2],b2:[3,4]},a2:{b1:[5,6],b2:[7,8]}}
 
+# work-around to make tensor playground show the value
+t1
+
+# which lables to keep from the 'a' dimension (empty means all)
 def filter_a tensor<float>(a{}):{}
+
+# which labels to keep from the 'b' dimension (empty means all)
 def filter_b tensor<float>(b{}):{b2:1.0}
 
 # apply filter for dimension 'a'
@@ -19,8 +18,10 @@ def t2 if(reduce(filter_a,count)==0,t1,t1*filter_a)
 # apply filter for dimension 'b'
 def t3 if(reduce(filter_b,count)==0,t2,t2*filter_b)
 
-# apply similarity metric using vec
+# the thing we are looking for
 def vec tensor<float>(x[2]):[3,4]
+
+# apply similarity metric using 'vec'
 def t4 reduce(join(t3,vec,f(x,y)(10-fabs(x-y))),sum,x)
 
 # calculate best filtered similarity
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index f6a9a09ab76f..66088ddbdc65 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -47,21 +47,6 @@ public class Flags {
 
     private static volatile TreeMap<FlagId, FlagDefinition> flags = new TreeMap<>();
 
-    public static final UnboundBooleanFlag USE_VESPA_ATHENZ = defineFeatureFlag(
-            "use-vespa-athenz", false,
-            List.of("hakonhall"), "2024-06-25", "2024-10-25",
-            "Whether to talk to Vespa Athenz instead of Yahoo Athenz in public systems. " +
-            "node-type is config in config server, controller in controller, and the appropriate " +
-            "host node type in host-admin.",
-            "Takes immediate effect wherever possible.",
-            NODE_TYPE);
-
-    public static final UnboundBooleanFlag USE_VESPA_ATHENZ_ZMS = defineFeatureFlag(
-            "use-vespa-athenz-zms", false,
-            List.of("hakonhall"), "2024-08-16", "2024-10-16",
-            "Whether to communicate with Vespa Athenz ZMS instead of Yahoo Athenz ZMS in public systems.",
-            "Typically takes effect on start of config server/controller, or immediately for hosts (host-admin).");
-
     public static final UnboundDoubleFlag DEFAULT_TERM_WISE_LIMIT = defineDoubleFlag(
             "default-term-wise-limit", 1.0,
             List.of("baldersheim"), "2020-12-02", "2024-12-31",
@@ -442,13 +427,6 @@ public class Flags {
             "Takes effect immediately",
             INSTANCE_ID);
 
-    public static final UnboundBooleanFlag USE_VESPA_ATHENZ_HOST_IDENTITY = defineFeatureFlag(
-            "use-vespa-athenz-host-identity", false,
-            List.of("freva"), "2024-06-12", "2024-11-01",
-            "Whether the host should get identity from Vespa Athenz. Only valid in public systems, noclave, AWS. Vespa version dimension refers to OS version.",
-            "Takes effect on next provisioning",
-            INSTANCE_ID, NODE_TYPE, VESPA_VERSION);
-
     public static final UnboundBooleanFlag LAUNCH_APPLICATION_ATHENZ_SERVICE = defineFeatureFlag(
             "launch-application-athenz-service", false,
             List.of("jonmv"), "2024-06-11", "2024-11-01",
@@ -518,6 +496,12 @@ public class Flags {
             "Takes effect on next host-admin run",
             HOSTNAME);
 
+    public static final UnboundBooleanFlag SNAPSHOTS_ENABLED = defineFeatureFlag(
+            "snapshots-enabled", false,
+            List.of("mpolden"), "2024-10-22", "2025-01-10",
+            "Whether node snapshots should be created when host storage is discarded",
+            "Takes effect immediately");
+
     /** WARNING: public for testing: All flags should be defined in {@link Flags}. */
     public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List<String> owners,
                                                        String createdAt, String expiresAt, String description,
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
index 5aeb6c9379e5..a433e3b63e25 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
@@ -202,6 +202,12 @@ public class PermanentFlags {
             "Takes effect immediately"
     );
 
+    public static final UnboundIntFlag MAX_TENANTS_PER_USER = defineIntFlag(
+            "max-tenants-per-user", 3,
+            "The maximum nr. of tenants a user can create",
+            "Takes effect immediately"
+    );
+
     public static final UnboundBooleanFlag ALLOW_DISABLE_MTLS = defineFeatureFlag(
             "allow-disable-mtls", true,
             "Allow application to disable client authentication",
@@ -489,7 +495,7 @@ public class PermanentFlags {
             "Takes effect on next iteration of UserManagementMaintainer");
 
     public static final UnboundBooleanFlag FORWARD_ALL_LOG_LEVELS = defineFeatureFlag(
-            "forward-all-log-levels", false,
+            "forward-all-log-levels", true,
             "Forward all log levels from nodes to logserver (debug and spam levels will be forwarded only if this flag is enabled)",
             "Takes effect at redeployment");
 
diff --git a/fsa/src/vespa/fsamanagers/conceptnethandle.h b/fsa/src/vespa/fsamanagers/conceptnethandle.h
index 18c7cf00cb71..5119bdd1b203 100644
--- a/fsa/src/vespa/fsamanagers/conceptnethandle.h
+++ b/fsa/src/vespa/fsamanagers/conceptnethandle.h
@@ -84,7 +84,7 @@ class ConceptNet::Handle {
    * @param fam File access mode (read or mmap). If not set, the
    *            global preferred access mode will be used.
    */
-  Handle(const std::string &fsafile, const std::string &datafile=NULL, FileAccessMethod fam = FILE_ACCESS_UNDEF) :
+  Handle(const std::string &fsafile, const std::string &datafile, FileAccessMethod fam = FILE_ACCESS_UNDEF) :
     _conceptNet(new RefCountableConceptNet(fsafile.c_str(),datafile.c_str(),fam))
   {
     _conceptNet->addReference();
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/AnyDataType.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/AnyDataType.java
new file mode 100644
index 000000000000..3b401ae40851
--- /dev/null
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/AnyDataType.java
@@ -0,0 +1,30 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.indexinglanguage.expressions;
+
+import com.yahoo.document.DataType;
+import com.yahoo.document.datatypes.FieldValue;
+
+/**
+ * A DataType representing "any". This is (so far) only needed during type resolution of indexing pipelines
+ * so it is placed here.
+ *
+ * @author bratseth
+ */
+class AnyDataType extends DataType {
+
+    static final AnyDataType instance = new AnyDataType();
+
+    private AnyDataType() {
+        super("any", DataType.lastPredefinedDataTypeId() + 1);
+    }
+
+    @Override
+    public FieldValue createFieldValue() { throw new UnsupportedOperationException(); }
+
+    @Override
+    public Class<?> getValueClass() { throw new UnsupportedOperationException(); }
+
+    @Override
+    public boolean isValueCompatible(FieldValue value) { return true; }
+
+}
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java
index 5a12ce76d2b6..1a5bda47b8be 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java
@@ -10,6 +10,7 @@
 
 import java.math.BigDecimal;
 import java.math.MathContext;
+import java.util.Objects;
 
 /**
  * @author Simon Thoresen Hult
@@ -48,59 +49,45 @@ public String toString() {
 
     public ArithmeticExpression(Expression left, Operator op, Expression right) {
         super(requiredInputType(left, right));
-        left.getClass(); // throws NullPointerException
-        op.getClass();
-        right.getClass();
-        this.left = left;
-        this.op = op;
-        this.right = right;
+        this.left = Objects.requireNonNull(left);
+        this.op = Objects.requireNonNull(op);
+        this.right = Objects.requireNonNull(right);
     }
 
+    public Expression getLeftHandSide() { return left; }
+
+    public Operator getOperator() { return op; }
+
+    public Expression getRightHandSide() { return right; }
+
     @Override
     public ArithmeticExpression convertChildren(ExpressionConverter converter) {
         // TODO: branch()?
         return new ArithmeticExpression(converter.convert(left), op, converter.convert(right));
     }
 
-    public Expression getLeftHandSide() {
-        return left;
-    }
-
-    public Operator getOperator() {
-        return op;
-    }
-
-    public Expression getRightHandSide() {
-        return right;
-    }
-
     @Override
-    protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
-        context.setValue(evaluate(context.setValue(input).execute(left).getValue(),
-                                  context.setValue(input).execute(right).getValue()));
+    protected void doVerify(VerificationContext context) {
+        DataType input = context.getCurrentType();
+        context.setCurrentType(evaluate(context.setCurrentType(input).verify(left).getCurrentType(),
+                                        context.setCurrentType(input).verify(right).getCurrentType()));
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        DataType input = context.getValueType();
-        context.setValueType(evaluate(context.setValueType(input).execute(left).getValueType(),
-                                      context.setValueType(input).execute(right).getValueType()));
+    protected void doExecute(ExecutionContext context) {
+        FieldValue input = context.getCurrentValue();
+        context.setCurrentValue(evaluate(context.setCurrentValue(input).execute(left).getCurrentValue(),
+                                         context.setCurrentValue(input).execute(right).getCurrentValue()));
     }
 
     private static DataType requiredInputType(Expression lhs, Expression rhs) {
         DataType lhsType = lhs.requiredInputType();
         DataType rhsType = rhs.requiredInputType();
-        if (lhsType == null) {
-            return rhsType;
-        }
-        if (rhsType == null) {
-            return lhsType;
-        }
-        if (!lhsType.equals(rhsType)) {
+        if (lhsType == null) return rhsType;
+        if (rhsType == null) return lhsType;
+        if (!lhsType.equals(rhsType))
             throw new VerificationException(ArithmeticExpression.class, "Operands require conflicting input types, " +
                                                                         lhsType.getName() + " vs " + rhsType.getName());
-        }
         return lhsType;
     }
 
@@ -115,20 +102,12 @@ public String toString() {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof ArithmeticExpression)) {
-            return false;
-        }
-        ArithmeticExpression exp = (ArithmeticExpression)obj;
-        if (!left.equals(exp.left)) {
-            return false;
-        }
-        if (!op.equals(exp.op)) {
-            return false;
-        }
-        if (!right.equals(exp.right)) {
-            return false;
-        }
+    public boolean equals(Object object) {
+        if (!(object instanceof ArithmeticExpression expression)) return false;
+
+        if (!left.equals(expression.left)) return false;
+        if (!op.equals(expression.op)) return false;
+        if (!right.equals(expression.right)) return false;
         return true;
     }
 
@@ -138,39 +117,28 @@ public int hashCode() {
     }
 
     private DataType evaluate(DataType lhs, DataType rhs) {
-        if (lhs == null || rhs == null) {
+        if (lhs == null || rhs == null)
             throw new VerificationException(this, "Attempting to perform arithmetic on a null value");
-        }
-        if (!(lhs instanceof NumericDataType) ||
-            !(rhs instanceof NumericDataType))
-        {
+        if (!(lhs instanceof NumericDataType) || !(rhs instanceof NumericDataType))
             throw new VerificationException(this, "Attempting to perform unsupported arithmetic: [" +
                                                   lhs.getName() + "] " + op + " [" + rhs.getName() + "]");
-        }
-        if (lhs == DataType.FLOAT || lhs == DataType.DOUBLE ||
-            rhs == DataType.FLOAT || rhs == DataType.DOUBLE)
-        {
-            if (lhs == DataType.DOUBLE || rhs == DataType.DOUBLE) {
+
+        if (lhs == DataType.FLOAT || lhs == DataType.DOUBLE || rhs == DataType.FLOAT || rhs == DataType.DOUBLE) {
+            if (lhs == DataType.DOUBLE || rhs == DataType.DOUBLE)
                 return DataType.DOUBLE;
-            }
             return DataType.FLOAT;
         }
-        if (lhs == DataType.LONG || rhs == DataType.LONG) {
+        if (lhs == DataType.LONG || rhs == DataType.LONG)
             return DataType.LONG;
-        }
         return DataType.INT;
     }
 
     private FieldValue evaluate(FieldValue lhs, FieldValue rhs) {
-        if (lhs == null || rhs == null) {
-            return null;
-        }
-        if (!(lhs instanceof NumericFieldValue) ||
-            !(rhs instanceof NumericFieldValue))
-        {
+        if (lhs == null || rhs == null) return null;
+        if (!(lhs instanceof NumericFieldValue) || !(rhs instanceof NumericFieldValue))
             throw new IllegalArgumentException("Unsupported operation: [" + lhs.getDataType().getName() + "] " +
                                                op + " [" + rhs.getDataType().getName() + "]");
-        }
+
         BigDecimal lhsVal = asBigDecimal((NumericFieldValue)lhs);
         BigDecimal rhsVal = asBigDecimal((NumericFieldValue)rhs);
         return switch (op) {
@@ -184,31 +152,27 @@ private FieldValue evaluate(FieldValue lhs, FieldValue rhs) {
 
     private FieldValue createFieldValue(FieldValue lhs, FieldValue rhs, BigDecimal val) {
         if (lhs instanceof FloatFieldValue || lhs instanceof DoubleFieldValue ||
-            rhs instanceof FloatFieldValue || rhs instanceof DoubleFieldValue)
-        {
-            if (lhs instanceof DoubleFieldValue || rhs instanceof DoubleFieldValue) {
+            rhs instanceof FloatFieldValue || rhs instanceof DoubleFieldValue) {
+            if (lhs instanceof DoubleFieldValue || rhs instanceof DoubleFieldValue)
                 return new DoubleFieldValue(val.doubleValue());
-            }
             return new FloatFieldValue(val.floatValue());
         }
-        if (lhs instanceof LongFieldValue || rhs instanceof LongFieldValue) {
+        if (lhs instanceof LongFieldValue || rhs instanceof LongFieldValue)
             return new LongFieldValue(val.longValue());
-        }
         return new IntegerFieldValue(val.intValue());
     }
 
     public static BigDecimal asBigDecimal(NumericFieldValue value) {
-        if (value instanceof ByteFieldValue) {
+        if (value instanceof ByteFieldValue)
             return BigDecimal.valueOf(((ByteFieldValue)value).getByte());
-        } else if (value instanceof DoubleFieldValue) {
+        else if (value instanceof DoubleFieldValue)
             return BigDecimal.valueOf(((DoubleFieldValue)value).getDouble());
-        } else if (value instanceof FloatFieldValue) {
+        else if (value instanceof FloatFieldValue)
             return BigDecimal.valueOf(((FloatFieldValue)value).getFloat());
-        } else if (value instanceof IntegerFieldValue) {
+        else if (value instanceof IntegerFieldValue)
             return BigDecimal.valueOf(((IntegerFieldValue)value).getInteger());
-        } else if (value instanceof LongFieldValue) {
+        else if (value instanceof LongFieldValue)
             return BigDecimal.valueOf(((LongFieldValue)value).getLong());
-        }
         throw new IllegalArgumentException("Unsupported numeric field value type '" +
                                            value.getClass().getName() + "'");
     }
@@ -218,4 +182,5 @@ public void selectMembers(ObjectPredicate predicate, ObjectOperation operation)
         left.select(predicate, operation);
         right.select(predicate, operation);
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/AttributeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/AttributeExpression.java
index fee96513786c..64544a4dafb6 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/AttributeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/AttributeExpression.java
@@ -14,4 +14,5 @@ public AttributeExpression(String fieldName) {
     public boolean equals(Object obj) {
         return super.equals(obj) && obj instanceof AttributeExpression;
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java
index ea9e778ddfbe..2ad8a2bac573 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.indexinglanguage.expressions;
 
 import com.yahoo.document.DataType;
+import com.yahoo.document.TensorDataType;
 import com.yahoo.document.datatypes.LongFieldValue;
 
 import java.util.Base64;
@@ -15,11 +16,28 @@ public Base64DecodeExpression() {
         super(DataType.STRING);
     }
 
+    @Override
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        super.setInputType(inputType, DataType.STRING, context);
+        return DataType.LONG;
+    }
+
+    @Override
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        super.setOutputType(outputType, DataType.LONG, context);
+        return DataType.STRING;
+    }
+
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        String input = String.valueOf(context.getValue());
-        if (input.isEmpty()) {
-            context.setValue(new LongFieldValue(Long.MIN_VALUE));
+        String input = String.valueOf(context.getCurrentValue());
+        if (input.isEmpty()) { // TODO: Or if context.getCurrentValue() is null or if context.getCurrentValue().getDataType() != DataType.STRING
+            context.setCurrentValue(new LongFieldValue(Long.MIN_VALUE));
             return;
         }
         if (input.length() > 12) {
@@ -33,23 +51,14 @@ protected void doExecute(ExecutionContext context) {
         for (int i = decoded.length; --i >= 0;) {
             output = (output << 8) + (((int)decoded[i]) & 0xff);
         }
-        context.setValue(new LongFieldValue(output));
-    }
-
-    @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+        context.setCurrentValue(new LongFieldValue(output));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.LONG;
-    }
+    public DataType createdOutputType() { return DataType.LONG; }
 
     @Override
-    public String toString() {
-        return "base64decode";
-    }
+    public String toString() { return "base64decode"; }
 
     @Override
     public boolean equals(Object obj) {
@@ -57,7 +66,6 @@ public boolean equals(Object obj) {
     }
 
     @Override
-    public int hashCode() {
-        return getClass().hashCode();
-    }
+    public int hashCode() { return getClass().hashCode(); }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java
index 5cdaf0ab5db1..e430d5ce8fb5 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java
@@ -15,38 +15,45 @@ public final class Base64EncodeExpression extends Expression {
     public Base64EncodeExpression() {
         super(DataType.LONG);
     }
+
+    @Override
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        super.setInputType(inputType, DataType.LONG, context);
+        return DataType.STRING;
+    }
+
+    @Override
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        super.setOutputType(outputType, DataType.STRING, context);
+        return DataType.LONG;
+    }
+
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        long input = ((LongFieldValue) context.getValue()).getLong();
+        long input = ((LongFieldValue) context.getCurrentValue()).getLong();
         byte[] output = new byte[8];
         for (int i = 0; i < output.length; ++i) {
             output[i] = (byte)(input & 0xffL);
             input >>>= 8;
         }
         String encoded = Base64.getEncoder().encodeToString(output);
-        context.setValue(new StringFieldValue(encoded));
-    }
-
-    @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+        context.setCurrentValue(new StringFieldValue(encoded));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.STRING;
-    }
+    public DataType createdOutputType() { return DataType.STRING; }
 
     @Override
-    public String toString() {
-        return "base64encode";
-    }
+    public String toString() { return "base64encode"; }
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof Base64EncodeExpression)) {
-            return false;
-        }
+        if (!(obj instanceof Base64EncodeExpression)) return false;
         return true;
     }
 
@@ -54,4 +61,5 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/BinarizeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/BinarizeExpression.java
index 491860cd788e..8c28f53be8ed 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/BinarizeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/BinarizeExpression.java
@@ -32,19 +32,29 @@ public BinarizeExpression(double threshold) {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        Optional<Tensor> tensor = ((TensorFieldValue)context.getValue()).getTensor();
-        if (tensor.isEmpty()) return;
-        context.setValue(new TensorFieldValue(tensor.get().map(v -> v > threshold ? 1 : 0)));
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        return super.setInputType(inputType, TensorDataType.any(), context);
+    }
+
+    @Override
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        return super.setOutputType(outputType, TensorDataType.any(), context);
     }
 
     @Override
     protected void doVerify(VerificationContext context) {
-        type = context.getValueType();
+        type = context.getCurrentType();
         if (! (type instanceof TensorDataType))
             throw new IllegalArgumentException("The 'binarize' function requires a tensor, but got " + type);
     }
 
+    @Override
+    protected void doExecute(ExecutionContext context) {
+        Optional<Tensor> tensor = ((TensorFieldValue)context.getCurrentValue()).getTensor();
+        if (tensor.isEmpty()) return;
+        context.setCurrentValue(new TensorFieldValue(tensor.get().map(v -> v > threshold ? 1 : 0)));
+    }
+
     @Override
     public DataType createdOutputType() { return type; }
 
@@ -57,6 +67,9 @@ public String toString() {
     public int hashCode() { return Objects.hash(threshold, toString().hashCode()); }
 
     @Override
-    public boolean equals(Object o) { return o instanceof BinarizeExpression; }
+    public boolean equals(Object o) {
+        if ( ! (o instanceof BinarizeExpression other)) return false;
+        return this.threshold == other.threshold;
+    }
 
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/BusyWaitExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/BusyWaitExpression.java
index 8ae77aad1b1e..61fa94402032 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/BusyWaitExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/BusyWaitExpression.java
@@ -6,22 +6,19 @@
 
 /**
  * Utility expression that will busy-wait the amount of time given in the numeric field.
- * Non-numeric fields will be ignored
+ * Non-numeric fields will be ignored.
+ *
  * @author baldersheim
  */
 public final class BusyWaitExpression extends Expression {
+
     public BusyWaitExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
 
-    private static double nihlakanta(int i) {
-        long a = 2 + i * 4L;
-        return (24 * (a+2))/(double)(a*(a+1)*(a+2)*(a+3));
-    }
-
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue value = context.getValue();
+        FieldValue value = context.getCurrentValue();
         if (value instanceof NumericFieldValue num) {
             double napSecs = num.getNumber().doubleValue();
             long doom = System.nanoTime() + (long)(1_000_000_000.0 * napSecs);
@@ -35,7 +32,11 @@ protected void doExecute(ExecutionContext context) {
         }
     }
 
-    @Override protected void doVerify(VerificationContext context) { }
+    private static double nihlakanta(int i) {
+        long a = 2 + i * 4L;
+        return (24 * (a+2))/(double)(a*(a+1)*(a+2)*(a+3));
+    }
+
     @Override public DataType createdOutputType() { return null; }
     @Override public String toString() { return "busy_wait"; }
     @Override public boolean equals(Object obj) { return obj instanceof BusyWaitExpression; }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java
index c12239a99c3d..be6d0f7c473c 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java
@@ -18,12 +18,12 @@
  */
 public final class CatExpression extends ExpressionList<Expression> {
 
-    public CatExpression(Expression... lst) {
-        this(List.of(lst));
+    public CatExpression(Expression... expressions) {
+        this(List.of(expressions));
     }
 
-    public CatExpression(Collection<? extends Expression> lst) {
-        super(lst, resolveInputType(lst));
+    public CatExpression(Collection<? extends Expression> expressions) {
+        super(expressions, resolveInputType(expressions));
     }
 
     @Override
@@ -31,42 +31,42 @@ public CatExpression convertChildren(ExpressionConverter converter) {
         return new CatExpression(convertChildList(converter));
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        DataType input = context.getCurrentType();
+        List<DataType> types = new LinkedList<>();
+        for (Expression exp : this) {
+            DataType val = context.setCurrentType(input).verify(exp).getCurrentType();
+            types.add(val);
+            if (val == null) {
+                throw new VerificationException(this, "Attempting to concatenate a null value (" + exp + ")");
+            }
+        }
+        context.setCurrentType(resolveOutputType(types));
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
+        FieldValue input = context.getCurrentValue();
         DataType inputType = input != null ? input.getDataType() : null;
-        VerificationContext ver = new VerificationContext(context);
-        context.fillVariableTypes(ver);
+        VerificationContext verificationContext = new VerificationContext(context.getFieldValue());
+        context.fillVariableTypes(verificationContext);
         List<FieldValue> values = new LinkedList<>();
         List<DataType> types = new LinkedList<>();
         for (Expression exp : this) {
-            FieldValue val = context.setValue(input).execute(exp).getValue();
+            FieldValue val = context.setCurrentValue(input).execute(exp).getCurrentValue();
             values.add(val);
 
             DataType type;
             if (val != null) {
                 type = val.getDataType();
             } else {
-                type = ver.setValueType(inputType).execute(this).getValueType();
+                type = verificationContext.setCurrentType(inputType).verify(this).getCurrentType();
             }
             types.add(type);
         }
         DataType type = resolveOutputType(types);
-        context.setValue(type == DataType.STRING ? asString(values) : asCollection(type, values));
-    }
-
-    @Override
-    protected void doVerify(VerificationContext context) {
-        DataType input = context.getValueType();
-        List<DataType> types = new LinkedList<>();
-        for (Expression exp : this) {
-            DataType val = context.setValueType(input).execute(exp).getValueType();
-            types.add(val);
-            if (val == null) {
-                throw new VerificationException(this, "Attempting to concatenate a null value (" + exp + ")");
-            }
-        }
-        context.setValueType(resolveOutputType(types));
+        context.setCurrentValue(type == DataType.STRING ? asString(values) : asCollection(type, values));
     }
 
     private static DataType resolveInputType(Collection<? extends Expression> list) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceExpression.java
index 7a556bd90d05..02443ced8112 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceExpression.java
@@ -36,24 +36,24 @@ public ChoiceExpression convertChildren(ExpressionConverter converter) {
         return new ChoiceExpression(asList().stream().map(choice -> converter.branch().convert(choice)).toList());
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        DataType input = context.getCurrentType();
+        context.setCurrentType(input);
+        for (Expression exp : this)
+            context.setCurrentType(input).verify(exp);
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
+        FieldValue input = context.getCurrentValue();
         for (Expression expression : this) {
-            context.setValue(input).execute(expression);
-            if (context.getValue() != null)
+            context.setCurrentValue(input).execute(expression);
+            if (context.getCurrentValue() != null)
                 break; // value found
         }
     }
 
-    @Override
-    protected void doVerify(VerificationContext context) {
-        DataType input = context.getValueType();
-        context.setValueType(input);
-        for (Expression exp : this)
-            context.setValueType(input).execute(exp);
-    }
-
     private static DataType resolveInputType(Collection<? extends Expression> list) {
         DataType previousInput = null;
         DataType previousOutput = null;
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java
index d7823b8d6a5e..48b69525df52 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java
@@ -13,24 +13,20 @@ public ClearStateExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
+    protected void doVerify(VerificationContext context) {
         context.clear();
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
+    protected void doExecute(ExecutionContext context) {
         context.clear();
     }
 
     @Override
-    public DataType createdOutputType() {
-        return null;
-    }
+    public DataType createdOutputType() { return null; }
 
     @Override
-    public String toString() {
-        return "clear_state";
-    }
+    public String toString() { return "clear_state"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CompositeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CompositeExpression.java
index fbc47e59ffae..df1ec9e39b44 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CompositeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CompositeExpression.java
@@ -17,12 +17,10 @@ protected CompositeExpression(DataType inputType) {
     }
 
     protected static String toScriptBlock(Expression exp) {
-        if (exp instanceof ScriptExpression) {
+        if (exp instanceof ScriptExpression)
             return exp.toString();
-        }
-        if (exp instanceof StatementExpression) {
+        if (exp instanceof StatementExpression)
             return new ScriptExpression((StatementExpression)exp).toString();
-        }
         return new ScriptExpression(new StatementExpression(exp)).toString();
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ConstantExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ConstantExpression.java
index 76ff93295983..986556a343f4 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ConstantExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ConstantExpression.java
@@ -21,18 +21,31 @@ public ConstantExpression(FieldValue value) {
         this.value = Objects.requireNonNull(value);
     }
 
-    public FieldValue getValue() {
-        return value;
+    public FieldValue getValue() { return value; }
+
+    @Override
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        super.setInputType(inputType, context);
+        return value.getDataType();
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(value);
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        // TODO:
+        //if (outputType != value.getDataType())
+        //    throw new IllegalArgumentException(this + " produces a " + value.getDataType() + ", but a " +
+        //                                       outputType + " is required");
+        return super.setOutputType(outputType, context);
     }
 
     @Override
     protected void doVerify(VerificationContext context) {
-        context.setValueType(value.getDataType());
+        context.setCurrentType(value.getDataType());
+    }
+
+    @Override
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(value);
     }
 
     @Override
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EchoExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EchoExpression.java
index 4001e2a6fd04..173f086d9231 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EchoExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EchoExpression.java
@@ -21,34 +21,22 @@ public EchoExpression(PrintStream out) {
         this.out = out;
     }
 
-    public PrintStream getOutputStream() {
-        return out;
-    }
+    public PrintStream getOutputStream() { return out; }
 
     @Override
     protected void doExecute(ExecutionContext context) {
-        out.println(context.getValue());
-    }
-
-    @Override
-    protected void doVerify(VerificationContext context) {
-        // empty
+        out.println(context.getCurrentValue());
     }
 
     @Override
-    public DataType createdOutputType() {
-        return null;
-    }
+    public DataType createdOutputType() { return null; }
 
     @Override
-    public String toString() {
-        return "echo";
-    }
+    public String toString() { return "echo"; }
 
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof EchoExpression rhs)) return false;
-
         return out == rhs.out;
     }
 
@@ -56,4 +44,5 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return getClass().hashCode() + out.hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EmbedExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EmbedExpression.java
index 8a51ce2c5b41..a51469a71f45 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EmbedExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/EmbedExpression.java
@@ -64,38 +64,83 @@ else if ( ! embedders.containsKey(embedderId)) {
         }
     }
 
+    @Override
+    public DataType setInputType(DataType type, VerificationContext context) {
+        super.setInputType(type, context);
+        // TODO: Activate type checking
+        // if ( ! (type == DataType.STRING)
+        //      && ! (type instanceof ArrayDataType array && array.getNestedType() == DataType.STRING))
+        //     throw new IllegalArgumentException("embed request either a string or array<string> input type, but got " + type);
+        return null; // embed cannot determine the output type from the input
+    }
+
+    @Override
+    public DataType setOutputType(DataType type, VerificationContext context) {
+        super.setOutputType(type, TensorDataType.any(), context);
+        return getInputType(context); // the input (string vs. array of string) cannot be determined from the output
+    }
+
     @Override
     public void setStatementOutput(DocumentType documentType, Field field) {
         targetType = toTargetTensor(field.getDataType());
         destination = documentType.getName() + "." + field.getName();
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        targetType = toTargetTensor(getOutputType(context));
+        if ( ! validTarget(targetType))
+            throw new VerificationException(this, "The embedding target field must either be a dense 1d tensor, a mapped 1d tensor, a mapped 2d tensor, " +
+                                                  "an array of dense 1d tensors, or a mixed 2d or 3d tensor");
+        if (targetType.rank() == 2 && targetType.mappedSubtype().rank() == 2) {
+            if (embedderArguments.size() != 1)
+                throw new VerificationException(this, "When the embedding target field is a 2d mapped tensor " +
+                                                      "the name of the tensor dimension that corresponds to the input array elements must " +
+                                                      "be given as a second argument to embed, e.g: ... | embed splade paragraph | ...");
+            if ( ! targetType.mappedSubtype().dimensionNames().contains(embedderArguments.get(0))) {
+                throw new VerificationException(this, "The dimension '" + embedderArguments.get(0) + "' given to embed " +
+                                                      "is not a sparse dimension of the target type " + targetType);
+
+            }
+        }
+        if (targetType.rank() == 3) {
+            if (embedderArguments.size() != 1)
+                throw new VerificationException(this, "When the embedding target field is a 3d tensor " +
+                                                      "the name of the tensor dimension that corresponds to the input array elements must " +
+                                                      "be given as a second argument to embed, e.g: ... | embed colbert paragraph | ...");
+            if ( ! targetType.mappedSubtype().dimensionNames().contains(embedderArguments.get(0)))
+                throw new VerificationException(this, "The dimension '" + embedderArguments.get(0) + "' given to embed " +
+                                                      "is not a sparse dimension of the target type " + targetType);
+        }
+        context.setCurrentType(createdOutputType());
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        if (context.getValue() == null) return;
+        if (context.getCurrentValue() == null) return;
         Tensor output;
-        if (context.getValue().getDataType() == DataType.STRING) {
+        if (context.getCurrentValue().getDataType() == DataType.STRING) {
             output = embedSingleValue(context);
         }
-        else if (context.getValue().getDataType() instanceof ArrayDataType &&
-                 ((ArrayDataType)context.getValue().getDataType()).getNestedType() == DataType.STRING) {
+        else if (context.getCurrentValue().getDataType() instanceof ArrayDataType arrayType
+                 && arrayType.getNestedType() == DataType.STRING) {
             output = embedArrayValue(context);
         }
         else {
             throw new IllegalArgumentException("Embedding can only be done on string or string array fields, not " +
-                                               context.getValue().getDataType());
+                                               context.getCurrentValue().getDataType());
         }
-        context.setValue(new TensorFieldValue(output));
+        context.setCurrentValue(new TensorFieldValue(output));
     }
 
     private Tensor embedSingleValue(ExecutionContext context) {
-        StringFieldValue input = (StringFieldValue)context.getValue();
+        StringFieldValue input = (StringFieldValue)context.getCurrentValue();
         return embed(input.getString(), targetType, context);
     }
 
     @SuppressWarnings("unchecked")
     private Tensor embedArrayValue(ExecutionContext context) {
-        var input = (Array<StringFieldValue>)context.getValue();
+        var input = (Array<StringFieldValue>)context.getCurrentValue();
         var builder = Tensor.Builder.of(targetType);
         if (targetType.rank() == 2)
             if (targetType.indexedSubtype().rank() == 1)
@@ -177,47 +222,13 @@ private Tensor embed(String input, TensorType targetType, ExecutionContext conte
                               targetType);
     }
 
-    @Override
-    protected void doVerify(VerificationContext context) {
-        String outputField = context.getOutputField();
-        if (outputField == null)
-            throw new VerificationException(this, "No output field in this statement: " +
-                                                  "Don't know what tensor type to embed into");
-        targetType = toTargetTensor(context.getInputType(this, outputField));
-        if ( ! validTarget(targetType))
-            throw new VerificationException(this, "The embedding target field must either be a dense 1d tensor, a mapped 1d tensor, a mapped 2d tensor, " +
-                                                  "an array of dense 1d tensors, or a mixed 2d or 3d tensor");
-        if (targetType.rank() == 2 && targetType.mappedSubtype().rank() == 2) {
-            if (embedderArguments.size() != 1)
-                throw new VerificationException(this, "When the embedding target field is a 2d mapped tensor " +
-                                                      "the name of the tensor dimension that corresponds to the input array elements must " +
-                                                      "be given as a second argument to embed, e.g: ... | embed splade paragraph | ...");
-            if ( ! targetType.mappedSubtype().dimensionNames().contains(embedderArguments.get(0))) {
-                throw new VerificationException(this, "The dimension '" + embedderArguments.get(0) + "' given to embed " +
-                                                      "is not a sparse dimension of the target type " + targetType);
-
-            }
-        }
-        if (targetType.rank() == 3) {
-            if (embedderArguments.size() != 1)
-                throw new VerificationException(this, "When the embedding target field is a 3d tensor " +
-                                                      "the name of the tensor dimension that corresponds to the input array elements must " +
-                                                      "be given as a second argument to embed, e.g: ... | embed colbert paragraph | ...");
-            if ( ! targetType.mappedSubtype().dimensionNames().contains(embedderArguments.get(0)))
-                throw new VerificationException(this, "The dimension '" + embedderArguments.get(0) + "' given to embed " +
-                                                      "is not a sparse dimension of the target type " + targetType);
-        }
-
-        context.setValueType(createdOutputType());
-    }
-
     @Override
     public DataType createdOutputType() {
         return new TensorDataType(targetType);
     }
 
     private static TensorType toTargetTensor(DataType dataType) {
-        if (dataType instanceof ArrayDataType) return toTargetTensor(((ArrayDataType) dataType).getNestedType());
+        if (dataType instanceof ArrayDataType) return toTargetTensor(dataType.getNestedType());
         if  ( ! ( dataType instanceof TensorDataType))
             throw new IllegalArgumentException("Expected a tensor data type but got " + dataType);
         return ((TensorDataType)dataType).getTensorType();
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExactExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExactExpression.java
index 7481363b7372..259a89e98032 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExactExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExactExpression.java
@@ -23,7 +23,7 @@
  */
 public final class ExactExpression extends Expression {
 
-    private int maxTokenLength;
+    private final int maxTokenLength;
 
     private ExactExpression(OptionalInt maxTokenLength) {
         super(DataType.STRING);
@@ -40,11 +40,11 @@ public ExactExpression(int maxTokenLength) {
 
     @Override
     protected void doExecute(ExecutionContext context) {
-        StringFieldValue input = (StringFieldValue) context.getValue();
+        StringFieldValue input = (StringFieldValue) context.getCurrentValue();
         if (input.getString().isEmpty()) return;
 
         StringFieldValue output = input.clone();
-        context.setValue(output);
+        context.setCurrentValue(output);
 
         String prev = output.getString();
         String next = toLowerCase(prev);
@@ -74,24 +74,16 @@ protected void doExecute(ExecutionContext context) {
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        // empty
-    }
-
-    @Override
-    public DataType createdOutputType() {
-        return null;
-    }
+    public DataType createdOutputType() { return null; }
 
     @Override
-    public String toString()
-    {
-        StringBuilder ret = new StringBuilder();
-        ret.append("exact");
+    public String toString() {
+        StringBuilder s = new StringBuilder();
+        s.append("exact");
         if (maxTokenLength != AnnotatorConfig.getDefaultMaxTokenLength()) {
-            ret.append(" max-token-length:" + maxTokenLength);
+            s.append(" max-token-length:").append(maxTokenLength);
         }
-        return ret.toString();
+        return s.toString();
     }
 
     @Override
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContext.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContext.java
index dc7c11394f90..ea659eb622ea 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContext.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContext.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.indexinglanguage.expressions;
 
 import com.yahoo.collections.LazyMap;
-import com.yahoo.document.DataType;
 import com.yahoo.document.FieldPath;
 import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.language.Language;
@@ -16,11 +15,11 @@
 /**
  * @author Simon Thoresen Hult
  */
-public class ExecutionContext implements FieldTypeAdapter, FieldValueAdapter {
+public class ExecutionContext {
 
     private final Map<String, FieldValue> variables = new HashMap<>();
-    private final FieldValueAdapter adapter;
-    private FieldValue value;
+    private final FieldValueAdapter fieldValue;
+    private FieldValue currentValue;
     private Language language;
     private final Map<Object, Object> cache = LazyMap.newHashMap();
 
@@ -28,8 +27,8 @@ public ExecutionContext() {
         this(null);
     }
 
-    public ExecutionContext(FieldValueAdapter adapter) {
-        this.adapter = adapter;
+    public ExecutionContext(FieldValueAdapter fieldValue) {
+        this.fieldValue = fieldValue;
         this.language = Language.UNKNOWN;
     }
 
@@ -44,46 +43,23 @@ public ExecutionContext execute(Expression expression) {
      * or a partial execution of only the statements accessing the available data.
      */
     public boolean isComplete() {
-        return adapter != null && adapter.isComplete();
+        return fieldValue != null && fieldValue.isComplete();
     }
 
-    @Override
-    public DataType getInputType(Expression exp, String fieldName) {
-        return adapter.getInputType(exp, fieldName);
+    public FieldValue getFieldValue(String fieldName) {
+        return fieldValue.getInputValue(fieldName);
     }
 
-    @Override
-    public FieldValue getInputValue(String fieldName) {
-        if (adapter == null) {
-            throw new IllegalStateException("Can not get field '" + fieldName + "' because adapter is null");
-        }
-        return adapter.getInputValue(fieldName);
-    }
-
-    @Override
-    public FieldValue getInputValue(FieldPath fieldPath) {
-        if (adapter == null) {
-            throw new IllegalStateException("Can not get field '" + fieldPath + "' because adapter is null");
-        }
-        return adapter.getInputValue(fieldPath);
+    public FieldValue getFieldValue(FieldPath fieldPath) {
+        return fieldValue.getInputValue(fieldPath);
     }
 
-    @Override
-    public void tryOutputType(Expression exp, String fieldName, DataType valueType) {
-        adapter.tryOutputType(exp, fieldName, valueType);
-    }
-
-    @Override
-    public ExecutionContext setOutputValue(Expression exp, String fieldName, FieldValue fieldValue) {
-        if (adapter == null)
-            throw new IllegalStateException("Can not set field '" + fieldName + "' because adapter is null");
-        adapter.setOutputValue(exp, fieldName, fieldValue);
+    public ExecutionContext setFieldValue(String fieldName, FieldValue fieldValue, Expression expression) {
+        this.fieldValue.setOutputValue(expression, fieldName, fieldValue);
         return this;
     }
 
-    public FieldValueAdapter getAdapter() {
-        return adapter;
-    }
+    public FieldValueAdapter getFieldValue() { return fieldValue; }
 
     public FieldValue getVariable(String name) {
         return variables.get(name);
@@ -94,6 +70,33 @@ public ExecutionContext setVariable(String name, FieldValue value) {
         return this;
     }
 
+    public FieldValue getCurrentValue() { return currentValue; }
+
+    public ExecutionContext setCurrentValue(FieldValue value) {
+        this.currentValue = value;
+        return this;
+    }
+
+    /** Returns a cached value, or null if not present. */
+    public Object getCachedValue(Object key) {
+        return cache.get(key);
+    }
+
+    public void putCachedValue(String key, Object value) {
+        cache.put(key, value);
+    }
+
+    /** Returns a mutable reference to the cache of this. */
+    public Map<Object, Object> getCache() {
+        return cache;
+    }
+
+    void fillVariableTypes(VerificationContext vctx) {
+        for (var entry : variables.entrySet()) {
+            vctx.setVariable(entry.getKey(), entry.getValue().getDataType());
+        }
+    }
+
     public Language getLanguage() { return language; }
 
     public ExecutionContext setLanguage(Language language) {
@@ -105,7 +108,7 @@ public Language resolveLanguage(Linguistics linguistics) {
         if (language != Language.UNKNOWN) return language;
         if (linguistics == null) return Language.ENGLISH;
 
-        Detection detection = linguistics.getDetector().detect(String.valueOf(value), null);
+        Detection detection = linguistics.getDetector().detect(String.valueOf(currentValue), null);
         if (detection == null) return Language.ENGLISH;
 
         Language detected = detection.getLanguage();
@@ -113,38 +116,11 @@ public Language resolveLanguage(Linguistics linguistics) {
         return detected;
     }
 
-    public FieldValue getValue() { return value; }
-
-    public ExecutionContext setValue(FieldValue value) {
-        this.value = value;
-        return this;
-    }
-
-    public void putCachedValue(String key, Object value) {
-        cache.put(key, value);
-    }
-
-    /** Returns a cached value, or null if not present. */
-    public Object getCachedValue(Object key) {
-        return cache.get(key);
-    }
-
-    /** Returns a mutable reference to the cache of this. */
-    public Map<Object, Object> getCache() {
-        return cache;
-    }
-
     /** Clears all state in this except the cache. */
     public ExecutionContext clear() {
         variables.clear();
-        value = null;
+        currentValue = null;
         return this;
     }
 
-    void fillVariableTypes(VerificationContext vctx) {
-        for (var entry : variables.entrySet()) {
-            vctx.setVariable(entry.getKey(), entry.getValue().getDataType());
-        }
-    }
-
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionValueExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionValueExpression.java
index 118ab14ad7bb..363f08ddb07e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionValueExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionValueExpression.java
@@ -30,17 +30,10 @@ protected void doExecute(ExecutionContext context) {
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {}
+    public DataType createdOutputType() { return UnresolvedDataType.INSTANCE; }
 
     @Override
-    public DataType createdOutputType() {
-        return UnresolvedDataType.INSTANCE;
-    }
-
-    @Override
-    public String toString() {
-        return "_";
-    }
+    public String toString() { return "_"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java
index 06d13557316b..99d5e51c9eda 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java
@@ -6,6 +6,7 @@
 import com.yahoo.document.DocumentType;
 import com.yahoo.document.DocumentUpdate;
 import com.yahoo.document.Field;
+import com.yahoo.document.TensorDataType;
 import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.language.Linguistics;
 import com.yahoo.language.process.Embedder;
@@ -22,17 +23,21 @@
  */
 public abstract class Expression extends Selectable {
 
-    private final DataType inputType;
+    private final DataType requiredInputType;
+
+    // Input and output types resolved during verification
+    private DataType inputType;
+    private DataType outputType;
 
     /**
      * Creates an expression
      *
-     * @param inputType the type of the input this expression can work with.
-     *                  UnresolvedDataType.INSTANCE if it works with any type,
-     *                  and null if it does not consume any input.
+     * @param requiredInputType the type of the input this expression can work with.
+     *                          UnresolvedDataType.INSTANCE if it works with any type,
+     *                          and null if it does not consume any input.
      */
-    protected Expression(DataType inputType) {
-        this.inputType = inputType;
+    protected Expression(DataType requiredInputType) {
+        this.requiredInputType = requiredInputType;
     }
 
     /**
@@ -44,78 +49,85 @@ protected Expression(DataType inputType) {
     /** Sets the document type and field the statement this expression is part of will write to */
     public void setStatementOutput(DocumentType documentType, Field field) {}
 
-    public final FieldValue execute(FieldValue val) {
-        return execute(new ExecutionContext().setValue(val));
-    }
+    public final DataType requiredInputType() { return requiredInputType; }
 
-    public final Document execute(AdapterFactory factory, Document doc) {
-        return execute(factory.newDocumentAdapter(doc));
-    }
+    public DataType getInputType(VerificationContext context) { return inputType; }
 
-    public final Document execute(DocumentAdapter adapter) {
-        execute((FieldValueAdapter)adapter);
-        return adapter.getFullOutput();
+    /**
+     * Sets the input type of this and returns the resulting output type, or null if it cannot be
+     * uniquely determined.
+     * This default implementation returns the same type, which is appropriate for all statements
+     * that do not change the type.
+     *
+     * @param inputType the type to set as the input type of this, or null if it cannot be determined
+     * @param requiredType the type the input type must be assignable to
+     * @param context the context of this
+     * @throws IllegalArgumentException if inputType isn't assignable to requiredType
+     */
+    protected final DataType setInputType(DataType inputType, DataType requiredType, VerificationContext context) {
+        // TODO: Activate type checking
+        // if ( ! (inputType instanceof TensorDataType))
+        //    throw new IllegalArgumentException(this + " requires a " + requiredType + ", but gets " + inputType);
+        this.inputType = inputType;
+        return inputType;
     }
 
-    public static DocumentUpdate execute(Expression expression, AdapterFactory factory, DocumentUpdate update) {
-        DocumentUpdate result = null;
-        for (UpdateAdapter adapter : factory.newUpdateAdapterList(update)) {
-            DocumentUpdate output = adapter.getExpression(expression).execute(adapter);
-            if (output == null) {
-                // ignore
-            } else if (result != null) {
-                result.addAll(output);
-            } else {
-                result = output;
-            }
-        }
-        if (result != null) {
-            result.setCreateIfNonExistent(update.getCreateIfNonExistent());
-        }
-        return result;
+    /**
+     * Sets the input type of this and returns the resulting output type, or null if it cannot be
+     * uniquely determined.
+     * Subtypes may implement this by calling setInputType(inputType, requiredType, VerificationContext context).
+     */
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        this.inputType = inputType;
+        return inputType;
     }
 
-    public final DocumentUpdate execute(UpdateAdapter adapter) {
-        execute((FieldValueAdapter)adapter);
-        return adapter.getOutput();
-    }
+    /**
+     * Returns the output type this is must produce (since it is part of a statement expression),
+     * or null if this is not set or there is no output produced at the end of the statement.
+     */
+    public DataType getOutputType(VerificationContext context) { return outputType; }
 
-    public final FieldValue execute(FieldValueAdapter adapter) {
-        return execute(new ExecutionContext(adapter));
+    /**
+     * Sets the output type of this and returns the resulting input type, or null if it cannot be
+     * uniquely determined.
+     * This implementation returns the same type, which is appropriate for all statements
+     * that do not change the type.
+     *
+     * @param outputType the type to set as the output type of this, or null if it cannot be determined
+     * @param requiredType the type the output type must be assignable to
+     * @param context the context of this
+     * @throws IllegalArgumentException if outputType isn't assignable to requiredType
+     */
+    protected final DataType setOutputType(DataType outputType, DataType requiredType, VerificationContext context) {
+        // TODO: Activate type checking
+        // if (outputType != null && ! requiredType.isAssignableFrom(outputType))
+        //     throw new IllegalArgumentException(this + " produces a " + outputType + " but " + requiredType + " is required");
+        this.outputType = outputType;
+        return outputType;
     }
 
-    public final FieldValue execute(ExecutionContext context) {
-        DataType inputType = requiredInputType();
-        if (inputType != null) {
-            FieldValue input = context.getValue();
-            if (input == null) {
-                return null;
-            }
-            if (!inputType.isValueCompatible(input)) {
-                throw new IllegalArgumentException("Expression '" + this + "' expected " + inputType.getName() +
-                                                   " input, got " + input.getDataType().getName());
-            }
-        }
-        doExecute(context);
-        DataType outputType = createdOutputType();
-        if (outputType != null) {
-            FieldValue output = context.getValue();
-            if (output != null && !outputType.isValueCompatible(output)) {
-                throw new IllegalStateException("Expression '" + this + "' expected " + outputType.getName() +
-                                                " output, got " + output.getDataType().getName());
-            }
-        }
-        return context.getValue();
+    /**
+     * Sets the output type of this and returns the resulting input type, or null if it cannot be
+     * uniquely determined.
+     * Subtypes implement this by calling setOutputType(outputType, requiredType, VerificationContext context).
+     */
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        this.outputType = outputType;
+        return outputType;
     }
 
-    protected abstract void doExecute(ExecutionContext context);
+    public abstract DataType createdOutputType();
+
+    /** Implementations that don't change the type should implement this to do verification. */
+    protected void doVerify(VerificationContext context) {}
 
     public final DataType verify() {
         return verify(new VerificationContext());
     }
 
     public final DataType verify(DataType val) {
-        return verify(new VerificationContext().setValueType(val));
+        return verify(new VerificationContext().setCurrentType(val));
     }
 
     public final Document verify(Document doc) {
@@ -160,23 +172,23 @@ public final DataType verify(FieldTypeAdapter adapter) {
     }
 
     public final DataType verify(VerificationContext context) {
-        if (inputType != null) {
-            DataType input = context.getValueType();
+        if (requiredInputType != null) {
+            DataType input = context.getCurrentType();
             if (input == null) {
-                throw new VerificationException(this, "Expected " + inputType.getName() + " input, but no input is specified");
+                throw new VerificationException(this, "Expected " + requiredInputType.getName() + " input, but no input is specified");
             }
             if (input.getPrimitiveType() == UnresolvedDataType.INSTANCE) {
                 throw new VerificationException(this, "Failed to resolve input type");
             }
-            if (!inputType.isAssignableFrom(input)) {
-                throw new VerificationException(this, "Expected " + inputType.getName() + " input, got " +
+            if (!requiredInputType.isAssignableFrom(input)) {
+                throw new VerificationException(this, "Expected " + requiredInputType.getName() + " input, got " +
                                                       input.getName());
             }
         }
         doVerify(context);
         DataType outputType = createdOutputType();
         if (outputType != null) {
-            DataType output = context.getValueType();
+            DataType output = context.getCurrentType();
             if (output == null) {
                 throw new VerificationException(this, "Expected " + outputType.getName() + " output, but no output is specified");
             }
@@ -187,14 +199,73 @@ public final DataType verify(VerificationContext context) {
                 throw new VerificationException(this, "Expected " + outputType.getName() + " output, got " + output.getName());
             }
         }
-        return context.getValueType();
+        return context.getCurrentType();
+    }
+
+    public final FieldValue execute(FieldValue val) {
+        return execute(new ExecutionContext().setCurrentValue(val));
     }
 
-    protected abstract void doVerify(VerificationContext context);
+    public final Document execute(AdapterFactory factory, Document doc) {
+        return execute(factory.newDocumentAdapter(doc));
+    }
 
-    public final DataType requiredInputType() { return inputType; }
+    public final Document execute(DocumentAdapter adapter) {
+        execute((FieldValueAdapter)adapter);
+        return adapter.getFullOutput();
+    }
 
-    public abstract DataType createdOutputType();
+    public static DocumentUpdate execute(Expression expression, AdapterFactory factory, DocumentUpdate update) {
+        DocumentUpdate result = null;
+        for (UpdateAdapter adapter : factory.newUpdateAdapterList(update)) {
+            DocumentUpdate output = adapter.getExpression(expression).execute(adapter);
+            if (output == null) {
+                // ignore
+            } else if (result != null) {
+                result.addAll(output);
+            } else {
+                result = output;
+            }
+        }
+        if (result != null) {
+            result.setCreateIfNonExistent(update.getCreateIfNonExistent());
+        }
+        return result;
+    }
+
+    public final DocumentUpdate execute(UpdateAdapter adapter) {
+        execute((FieldValueAdapter)adapter);
+        return adapter.getOutput();
+    }
+
+    public final FieldValue execute(FieldValueAdapter adapter) {
+        return execute(new ExecutionContext(adapter));
+    }
+
+    public final FieldValue execute(ExecutionContext context) {
+        DataType inputType = requiredInputType();
+        if (inputType != null) {
+            FieldValue input = context.getCurrentValue();
+            if (input == null) return null;
+
+            if (!inputType.isValueCompatible(input)) {
+                throw new IllegalArgumentException("Expression '" + this + "' expected " + inputType.getName() +
+                                                   " input, got " + input.getDataType().getName());
+            }
+        }
+        doExecute(context);
+        DataType outputType = createdOutputType();
+        if (outputType != null) {
+            FieldValue output = context.getCurrentValue();
+            if (output != null && !outputType.isValueCompatible(output)) {
+                throw new IllegalStateException("Expression '" + this + "' expected " + outputType.getName() +
+                                                " output, got " + output.getDataType().getName());
+            }
+        }
+        return context.getCurrentValue();
+    }
+
+    protected abstract void doExecute(ExecutionContext context);
 
     /** Creates an expression with simple lingustics for testing */
     public static Expression fromString(String expression) throws ParseException {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java
index ef9e6f41a6db..a31e09e59e1e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java
@@ -8,9 +8,9 @@
 import com.yahoo.vespa.objects.ObjectOperation;
 import com.yahoo.vespa.objects.ObjectPredicate;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 
@@ -19,7 +19,7 @@
  */
 public abstract class ExpressionList<T extends Expression> extends CompositeExpression implements Iterable<T> {
 
-    private final List<T> expressions = new LinkedList<T>();
+    private final List<T> expressions = new ArrayList<T>();
 
     protected ExpressionList(Iterable<? extends T> expressions, DataType inputType) {
         super(inputType);
@@ -28,6 +28,8 @@ protected ExpressionList(Iterable<? extends T> expressions, DataType inputType)
         }
     }
 
+    public List<T> expressions() { return expressions; }
+
     protected List<Expression> convertChildList(ExpressionConverter converter) {
         return asList().stream().map(converter::convert).filter(Objects::nonNull).toList();
     }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldTypeAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldTypeAdapter.java
index 9633c8dcfb93..6d1a72b33cce 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldTypeAdapter.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldTypeAdapter.java
@@ -8,8 +8,8 @@
  */
 public interface FieldTypeAdapter {
 
-    DataType getInputType(Expression exp, String fieldName);
+    DataType getInputType(Expression expression, String fieldName);
 
-    void tryOutputType(Expression exp, String fieldName, DataType valueType);
+    void tryOutputType(Expression expression, String fieldName, DataType valueType);
 
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldValueAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldValueAdapter.java
index 91622c4b85a4..685d7b12c823 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldValueAdapter.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FieldValueAdapter.java
@@ -12,7 +12,7 @@ public interface FieldValueAdapter extends FieldTypeAdapter {
     FieldValue getInputValue(String fieldName);
     FieldValue getInputValue(FieldPath fieldPath);
 
-    FieldValueAdapter setOutputValue(Expression exp, String fieldName, FieldValue fieldValue);
+    FieldValueAdapter setOutputValue(Expression expression, String fieldName, FieldValue fieldValue);
 
     /** Returns true if this has values for all possibly existing inputs, or represents a partial set of values. */
     boolean isComplete();
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java
index 557c91d4e533..6b44e4ef3cc3 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java
@@ -17,37 +17,42 @@
 import java.util.Map;
 
 /**
+ * Deprecated.
+ *
  * @author Simon Thoresen Hult
  */
+// TODO: Remove on Vespa 9
 public final class FlattenExpression extends Expression {
 
     public FlattenExpression() {
         super(DataType.STRING);
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        StringFieldValue input = (StringFieldValue) context.getValue();
+        StringFieldValue input = (StringFieldValue) context.getCurrentValue();
         SpanTree tree = input.getSpanTree(SpanTrees.LINGUISTICS);
         Map<Integer, List<String>> map = new HashMap<>();
         for (Annotation anno : tree) {
             SpanNode span = anno.getSpanNode();
-            if (span == null) {
-                continue;
-            }
-            if (anno.getType() != AnnotationTypes.TERM) {
-                continue;
-            }
+            if (span == null) continue;
+            if (anno.getType() != AnnotationTypes.TERM) continue;
+
             FieldValue val = anno.getFieldValue();
-            String str;
+            String s;
             if (val instanceof StringFieldValue) {
-                str = ((StringFieldValue)val).getString();
+                s = ((StringFieldValue)val).getString();
             } else {
-                str = input.getString().substring(span.getFrom(), span.getTo());
+                s = input.getString().substring(span.getFrom(), span.getTo());
             }
             Integer pos = span.getTo();
             List<String> entry = map.computeIfAbsent(pos, k -> new LinkedList<>());
-            entry.add(str);
+            entry.add(s);
         }
         String inputVal = String.valueOf(input);
         StringBuilder output = new StringBuilder();
@@ -61,23 +66,14 @@ protected void doExecute(ExecutionContext context) {
                 output.append(inputVal.charAt(i));
             }
         }
-        context.setValue(new StringFieldValue(output.toString()));
+        context.setCurrentValue(new StringFieldValue(output.toString()));
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
-    }
-
-    @Override
-    public DataType createdOutputType() {
-        return DataType.STRING;
-    }
+    public DataType createdOutputType() { return DataType.STRING; }
 
     @Override
-    public String toString() {
-        return "flatten";
-    }
+    public String toString() { return "flatten"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
index 256ae68ba656..ec5bbbf94987 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
@@ -18,75 +18,71 @@
  */
 public final class ForEachExpression extends CompositeExpression {
 
-    private final Expression exp;
+    private final Expression expression;
 
-    public ForEachExpression(Expression exp) {
+    public ForEachExpression(Expression expression) {
         super(UnresolvedDataType.INSTANCE);
-        this.exp = Objects.requireNonNull(exp);
+        this.expression = Objects.requireNonNull(expression);
     }
 
-    public Expression getInnerExpression() {
-        return exp;
-    }
+    public Expression getInnerExpression() { return expression; }
 
     @Override
     public ForEachExpression convertChildren(ExpressionConverter converter) {
-        Expression converted = converter.convert(exp);
+        Expression converted = converter.convert(expression);
         return converted != null ?  new ForEachExpression(converted) : null;
     }
 
     @Override
     public void setStatementOutput(DocumentType documentType, Field field) {
-        exp.setStatementOutput(documentType, field);
+        expression.setStatementOutput(documentType, field);
     }
 
     @Override
-    protected void doExecute(final ExecutionContext context) {
-        FieldValue input = context.getValue();
-        if (input instanceof Array || input instanceof WeightedSet) {
-            FieldValue next = new MyConverter(context, exp).convert(input);
-            if (next == null) {
-                VerificationContext vctx = new VerificationContext(context);
-                context.fillVariableTypes(vctx);
-                vctx.setValueType(input.getDataType()).execute(this);
-                next = vctx.getValueType().createFieldValue();
-            }
-            context.setValue(next);
-        } else if (input instanceof Struct) {
-            context.setValue(new MyConverter(context, exp).convert(input));
-        } else {
-            throw new IllegalArgumentException("Expected Array, Struct or WeightedSet input, got " +
-                                               input.getDataType().getName());
-        }
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        // TODO: Activate type checking
+        // if ( ! inputType.isMultivalue())
+        //    throw new IllegalArgumentException("for_each requires a multivalue type, but gets " + inputType);
+        expression.setInputType(inputType.getNestedType(), context);
+        return super.setInputType(inputType, context);
+    }
+
+    @Override
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        // TODO: Activate type checking
+        // if ( ! outputType.isMultivalue())
+        //    throw new IllegalArgumentException("for_each produces a multivalue type, but " + outputType + " is required");
+        expression.setOutputType(outputType.getNestedType(), context);
+        return super.setOutputType(outputType, context);
     }
 
     @Override
     protected void doVerify(VerificationContext context) {
-        DataType valueType = context.getValueType();
+        DataType valueType = context.getCurrentType();
         if (valueType instanceof ArrayDataType || valueType instanceof WeightedSetDataType) {
             // Set type for block evaluation
-            context.setValueType(((CollectionDataType)valueType).getNestedType());
+            context.setCurrentType(((CollectionDataType)valueType).getNestedType());
 
-            // Evaluate block, which sets value>Type to the output of the block
-            context.execute(exp);
+            // Evaluate block, which sets valueType to the output of the block
+            context.verify(expression);
 
             // Value type outside block becomes the collection type having the block output type as argument
             if (valueType instanceof ArrayDataType) {
-                context.setValueType(DataType.getArray(context.getValueType()));
+                context.setCurrentType(DataType.getArray(context.getCurrentType()));
             } else {
                 WeightedSetDataType wset = (WeightedSetDataType)valueType;
-                context.setValueType(DataType.getWeightedSet(context.getValueType(), wset.createIfNonExistent(), wset.removeIfZero()));
+                context.setCurrentType(DataType.getWeightedSet(context.getCurrentType(), wset.createIfNonExistent(), wset.removeIfZero()));
             }
         }
         else if (valueType instanceof StructDataType) {
             for (Field field : ((StructDataType)valueType).getFields()) {
                 DataType fieldType = field.getDataType();
-                DataType structValueType = context.setValueType(fieldType).execute(exp).getValueType();
+                DataType structValueType = context.setCurrentType(fieldType).verify(expression).getCurrentType();
                 if (!fieldType.isAssignableFrom(structValueType))
                     throw new VerificationException(this, "Expected " + fieldType.getName() + " output, got " +
                                                           structValueType.getName());
             }
-            context.setValueType(valueType);
+            context.setCurrentType(valueType);
         }
         else {
             throw new VerificationException(this, "Expected Array, Struct or WeightedSet input, got " +
@@ -94,9 +90,29 @@ else if (valueType instanceof StructDataType) {
         }
     }
 
+    @Override
+    protected void doExecute(ExecutionContext context) {
+        FieldValue input = context.getCurrentValue();
+        if (input instanceof Array || input instanceof WeightedSet) {
+            FieldValue next = new MyConverter(context, expression).convert(input);
+            if (next == null) {
+                VerificationContext verificationContext = new VerificationContext(context.getFieldValue());
+                context.fillVariableTypes(verificationContext);
+                verificationContext.setCurrentType(input.getDataType()).verify(this);
+                next = verificationContext.getCurrentType().createFieldValue();
+            }
+            context.setCurrentValue(next);
+        } else if (input instanceof Struct) {
+            context.setCurrentValue(new MyConverter(context, expression).convert(input));
+        } else {
+            throw new IllegalArgumentException("Expected Array, Struct or WeightedSet input, got " +
+                                               input.getDataType().getName());
+        }
+    }
+
     @Override
     public DataType createdOutputType() {
-        if (exp.createdOutputType() == null) {
+        if (expression.createdOutputType() == null) {
             return null;
         }
         return UnresolvedDataType.INSTANCE;
@@ -104,19 +120,19 @@ public DataType createdOutputType() {
 
     @Override
     public String toString() {
-        return "for_each { " + exp + " }";
+        return "for_each { " + expression + " }";
     }
 
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof ForEachExpression rhs)) return false;
-        if (!exp.equals(rhs.exp)) return false;
+        if (!expression.equals(rhs.expression)) return false;
         return true;
     }
 
     @Override
     public int hashCode() {
-        return getClass().hashCode() + exp.hashCode();
+        return getClass().hashCode() + expression.hashCode();
     }
 
     private static final class MyConverter extends FieldValueConverter {
@@ -137,14 +153,14 @@ protected boolean shouldConvert(FieldValue value) {
 
         @Override
         protected FieldValue doConvert(FieldValue value) {
-            context.setValue(value).execute(expression);
-            return context.getValue();
+            context.setCurrentValue(value).execute(expression);
+            return context.getCurrentValue();
         }
     }
 
     @Override
     public void selectMembers(ObjectPredicate predicate, ObjectOperation operation) {
-        select(exp, predicate, operation);
+        select(expression, predicate, operation);
     }
 
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java
index bb9a1a034960..4ebbc8bdad25 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java
@@ -19,27 +19,23 @@ public GetFieldExpression(String fieldName) {
         this.fieldName = fieldName;
     }
 
-    public String getFieldName() {
-        return fieldName;
+    public String getFieldName() { return fieldName; }
+
+    @Override
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        super.setInputType(inputType, context);
+        return context.getFieldType(fieldName, this);
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
-        if (!(input instanceof StructuredFieldValue struct)) {
-            throw new IllegalArgumentException("Expected structured input, got " + input.getDataType().getName());
-        }
-        Field field = struct.getField(fieldName);
-        if (field == null) {
-            throw new IllegalArgumentException("Field '" + fieldName + "' not found in struct type '" +
-                                               struct.getDataType().getName() + "'");
-        }
-        context.setValue(struct.getFieldValue(field));
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        super.setOutputType(context.getFieldType(fieldName, this), outputType, context);
+        return AnyDataType.instance;
     }
 
     @Override
     protected void doVerify(VerificationContext context) {
-        DataType input = context.getValueType();
+        DataType input = context.getCurrentType();
         if (!(input instanceof StructuredDataType)) {
             throw new VerificationException(this, "Expected structured input, got " + input.getName());
         }
@@ -48,7 +44,20 @@ protected void doVerify(VerificationContext context) {
             throw new VerificationException(this, "Field '" + fieldName + "' not found in struct type '" +
                                                   input.getName() + "'");
         }
-        context.setValueType(field.getDataType());
+        context.setCurrentType(field.getDataType());
+    }
+
+    @Override
+    protected void doExecute(ExecutionContext context) {
+        FieldValue input = context.getCurrentValue();
+        if (!(input instanceof StructuredFieldValue struct))
+            throw new IllegalArgumentException("Expected structured input, got " + input.getDataType().getName());
+
+        Field field = struct.getField(fieldName);
+        if (field == null)
+            throw new IllegalArgumentException("Field '" + fieldName + "' not found in struct type '" +
+                                               struct.getDataType().getName() + "'");
+        context.setCurrentValue(struct.getFieldValue(field));
     }
 
     @Override
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java
index 8b2604bfec5c..1f5e1c4f5b9d 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java
@@ -8,29 +8,39 @@
  */
 public final class GetVarExpression extends Expression {
 
-    private final String varName;
+    private final String variableName;
 
-    public GetVarExpression(String varName) {
+    public GetVarExpression(String variableName) {
         super(null);
-        this.varName = varName;
+        this.variableName = variableName;
     }
 
-    public String getVariableName() {
-        return varName;
+    public String getVariableName() { return variableName; }
+
+    @Override
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        super.setInputType(inputType, context);
+        return context.getVariable(variableName);
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(context.getVariable(varName));
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        super.setOutputType(context.getVariable(variableName), outputType, context);
+        return AnyDataType.instance;
     }
 
     @Override
     protected void doVerify(VerificationContext context) {
-        DataType input = context.getVariable(varName);
+        DataType input = context.getVariable(variableName);
         if (input == null) {
-            throw new VerificationException(this, "Variable '" + varName + "' not found");
+            throw new VerificationException(this, "Variable '" + variableName + "' not found");
         }
-        context.setValueType(input);
+        context.setCurrentType(input);
+    }
+
+    @Override
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(context.getVariable(variableName));
     }
 
     @Override
@@ -40,19 +50,19 @@ public DataType createdOutputType() {
 
     @Override
     public String toString() {
-        return "get_var " + varName;
+        return "get_var " + variableName;
     }
 
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof GetVarExpression rhs)) return false;
-        if (!varName.equals(rhs.varName)) return false;
+        if (!variableName.equals(rhs.variableName)) return false;
         return true;
     }
 
     @Override
     public int hashCode() {
-        return getClass().hashCode() + varName.hashCode();
+        return getClass().hashCode() + variableName.hashCode();
     }
 
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java
index 92fc852a61fe..58037e3927d5 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java
@@ -15,68 +15,78 @@
  */
 public final class GuardExpression extends CompositeExpression {
 
-    private final Expression exp;
+    private final Expression expression;
     private final boolean shouldExecute;
 
-    public GuardExpression(Expression exp) {
-        super(exp.requiredInputType());
-        this.exp = exp;
-        shouldExecute = shouldExecute(exp);
+    public GuardExpression(Expression expression) {
+        super(expression.requiredInputType());
+        this.expression = expression;
+        shouldExecute = shouldExecute(expression);
     }
 
-    public Expression getInnerExpression() {
-        return exp;
-    }
+    public Expression getInnerExpression() { return expression; }
 
     @Override
     public GuardExpression convertChildren(ExpressionConverter converter) {
-        return new GuardExpression(converter.convert(exp));
+        return new GuardExpression(converter.convert(expression));
     }
 
     @Override
-    public void setStatementOutput(DocumentType documentType, Field field) {
-        exp.setStatementOutput(documentType, field);
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        super.setInputType(inputType, context);
+        return expression.setInputType(inputType, context);
+    }
+
+    @Override
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        super.setOutputType(outputType, context);
+        return expression.setOutputType(outputType, context);
+    }
+
+    @Override
+    protected void doVerify(VerificationContext context) {
+        expression.verify(context);
     }
 
     @Override
     protected void doExecute(ExecutionContext context) {
-        if (!shouldExecute && context.getAdapter() instanceof UpdateAdapter) {
-            context.setValue(null);
+        if (!shouldExecute && context.getFieldValue() instanceof UpdateAdapter) {
+            context.setCurrentValue(null);
         } else {
-            exp.execute(context);
+            expression.execute(context);
         }
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        exp.verify(context);
+    public void setStatementOutput(DocumentType documentType, Field field) {
+        expression.setStatementOutput(documentType, field);
     }
 
     @Override
     public DataType createdOutputType() {
-        return exp.createdOutputType();
+        return expression.createdOutputType();
     }
 
     @Override
     public String toString() {
-        return "guard " + toScriptBlock(exp);
+        return "guard " + toScriptBlock(expression);
     }
 
     @Override
     public void selectMembers(ObjectPredicate predicate, ObjectOperation operation) {
-         select(exp, predicate, operation);
+         select(expression, predicate, operation);
     }
 
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof GuardExpression rhs)) return false;
-        if (!exp.equals(rhs.exp)) return false;
+        if (!expression.equals(rhs.expression)) return false;
         return true;
     }
 
     @Override
     public int hashCode() {
-        return getClass().hashCode() + exp.hashCode();
+        return getClass().hashCode() + expression.hashCode();
     }
 
     private static boolean shouldExecute(Expression exp) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HashExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HashExpression.java
index eb3e316ba816..bdfcd6155803 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HashExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HashExpression.java
@@ -39,13 +39,27 @@ public void setStatementOutput(DocumentType documentType, Field field) {
         targetType = field.getDataType().getPrimitiveType();
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        String outputField = context.getOutputField();
+        if (outputField == null)
+            throw new VerificationException(this, "No output field in this statement: " +
+                                                  "Don't know what value to hash to");
+        DataType outputFieldType = context.getFieldType(this);
+        if ( ! canStoreHash(outputFieldType))
+            throw new VerificationException(this, "The type of the output field " + outputField +
+                                                  " is not int or long but " + outputFieldType);
+        targetType = outputFieldType.getPrimitiveType();
+        context.setCurrentType(createdOutputType());
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        StringFieldValue input = (StringFieldValue) context.getValue();
+        StringFieldValue input = (StringFieldValue) context.getCurrentValue();
         if (targetType.equals(DataType.INT))
-            context.setValue(new IntegerFieldValue(hashToInt(input.getString())));
+            context.setCurrentValue(new IntegerFieldValue(hashToInt(input.getString())));
         else if (targetType.equals(DataType.LONG))
-            context.setValue(new LongFieldValue(hashToLong(input.getString())));
+            context.setCurrentValue(new LongFieldValue(hashToLong(input.getString())));
         else
             throw new IllegalStateException(); // won't happen
     }
@@ -58,20 +72,6 @@ private long hashToLong(String value) {
         return hasher.hashString(value, StandardCharsets.UTF_8).asLong();
     }
 
-    @Override
-    protected void doVerify(VerificationContext context) {
-        String outputField = context.getOutputField();
-        if (outputField == null)
-            throw new VerificationException(this, "No output field in this statement: " +
-                                                  "Don't know what value to hash to");
-        DataType outputFieldType = context.getInputType(this, outputField);
-        if ( ! canStoreHash(outputFieldType))
-            throw new VerificationException(this, "The type of the output field " + outputField +
-                                                  " is not int or long but " + outputFieldType);
-        targetType = outputFieldType.getPrimitiveType();
-        context.setValueType(createdOutputType());
-    }
-
     private boolean canStoreHash(DataType type) {
         if (type.equals(DataType.INT)) return true;
         if (type.equals(DataType.LONG)) return true;
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java
index a344a1d867ed..a7d314ff45a4 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java
@@ -17,11 +17,16 @@ public HexDecodeExpression() {
         super(DataType.STRING);
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        String input = String.valueOf(context.getValue());
+        String input = String.valueOf(context.getCurrentValue());
         if (input.isEmpty()) {
-            context.setValue(new LongFieldValue(Long.MIN_VALUE));
+            context.setCurrentValue(new LongFieldValue(Long.MIN_VALUE));
             return;
         }
         BigInteger output;
@@ -36,23 +41,14 @@ protected void doExecute(ExecutionContext context) {
         if (output.compareTo(BigInteger.ZERO) > 0 && output.bitLength() == 64) {
             output = output.subtract(ULONG_MAX); // flip to negative
         }
-        context.setValue(new LongFieldValue(output.longValue()));
-    }
-
-    @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+        context.setCurrentValue(new LongFieldValue(output.longValue()));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.LONG;
-    }
+    public DataType createdOutputType() { return DataType.LONG; }
 
     @Override
-    public String toString() {
-        return "hexdecode";
-    }
+    public String toString() { return "hexdecode"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java
index 249ddf03fc22..c32b08e12484 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java
@@ -15,31 +15,25 @@ public HexEncodeExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        long input = ((LongFieldValue) context.getValue()).getLong();
-        context.setValue(new StringFieldValue(Long.toHexString(input)));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        long input = ((LongFieldValue) context.getCurrentValue()).getLong();
+        context.setCurrentValue(new StringFieldValue(Long.toHexString(input)));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.STRING;
-    }
+    public DataType createdOutputType() { return DataType.STRING; }
 
     @Override
-    public String toString() {
-        return "hexencode";
-    }
+    public String toString() { return "hexencode"; }
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof HexEncodeExpression)) {
-            return false;
-        }
+        if (!(obj instanceof HexEncodeExpression)) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java
index 17c4e7a49846..550355c9d242 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java
@@ -15,24 +15,20 @@ public HostNameExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new StringFieldValue(normalizeHostName(getDefaults().vespaHostname())));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new StringFieldValue(normalizeHostName(getDefaults().vespaHostname())));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.STRING;
-    }
+    public DataType createdOutputType() { return DataType.STRING; }
 
     @Override
-    public String toString() {
-        return "hostname";
-    }
+    public String toString() { return "hostname"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java
index 7362cbcbdf72..eeaee3ff1355 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java
@@ -84,20 +84,32 @@ public void setStatementOutput(DocumentType documentType, Field field) {
 
     public Expression getIfFalseExpression() { return ifFalse; }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        DataType input = context.getCurrentType();
+        context.setCurrentType(input).verify(left);
+        context.setCurrentType(input).verify(right);
+        var trueValue = context.setCurrentType(input).verify(ifTrue);
+        var falseValue = context.setCurrentType(input).verify(ifFalse);
+        var valueType = trueValue.getCurrentType().isAssignableFrom(falseValue.getCurrentType()) ?
+                                trueValue.getCurrentType() : falseValue.getCurrentType();
+        context.setCurrentType(valueType);
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
-        FieldValue leftValue = context.setValue(input).execute(left).getValue();
+        FieldValue input = context.getCurrentValue();
+        FieldValue leftValue = context.setCurrentValue(input).execute(left).getCurrentValue();
         if (leftValue == null) {
-            context.setValue(null);
+            context.setCurrentValue(null);
             return;
         }
-        FieldValue rightValue = context.setValue(input).execute(right).getValue();
+        FieldValue rightValue = context.setCurrentValue(input).execute(right).getCurrentValue();
         if (rightValue == null) {
-            context.setValue(null);
+            context.setCurrentValue(null);
             return;
         }
-        context.setValue(input);
+        context.setCurrentValue(input);
         if (isTrue(leftValue, comparator, rightValue)) {
             ifTrue.execute(context);
         } else if (ifFalse != null) {
@@ -105,18 +117,6 @@ protected void doExecute(ExecutionContext context) {
         }
     }
 
-    @Override
-    protected void doVerify(VerificationContext context) {
-        DataType input = context.getValueType();
-        context.setValueType(input).execute(left);
-        context.setValueType(input).execute(right);
-        var trueValue = context.setValueType(input).execute(ifTrue);
-        var falseValue = context.setValueType(input).execute(ifFalse);
-        var valueType = trueValue.getValueType().isAssignableFrom(falseValue.getValueType()) ?
-                        trueValue.getValueType() : falseValue.getValueType();
-        context.setValueType(valueType);
-    }
-
     @Override
     public void selectMembers(ObjectPredicate predicate, ObjectOperation operation) {
         select(left, predicate, operation);
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/InputExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/InputExpression.java
index d49ca4ae6798..48cf6ac237c3 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/InputExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/InputExpression.java
@@ -9,7 +9,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author Simon Thoresen Hult
@@ -26,29 +25,30 @@ public InputExpression(String fieldName) {
         this.fieldName = fieldName;
     }
 
-    public String getFieldName() {
-        return fieldName;
+    public String getFieldName() { return fieldName; }
+
+    @Override
+    protected void doVerify(VerificationContext context) {
+        DataType val = context.getFieldType(fieldName, this);
+        if (val == null)
+            throw new VerificationException(this, "Field '" + fieldName + "' not found");
+        context.setCurrentType(val);
     }
 
     @Override
     protected void doExecute(ExecutionContext context) {
         if (fieldPath != null)
-            context.setValue(context.getInputValue(fieldPath));
+            context.setCurrentValue(context.getFieldValue(fieldPath));
         else
-            context.setValue(context.getInputValue(fieldName));
+            context.setCurrentValue(context.getFieldValue(fieldName));
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        DataType val = context.getInputType(this, fieldName);
-        if (val == null)
-            throw new VerificationException(this, "Field '" + fieldName + "' not found");
-        context.setValueType(val);
-    }
+    public DataType createdOutputType() { return UnresolvedDataType.INSTANCE; }
 
     @Override
-    public DataType createdOutputType() {
-        return UnresolvedDataType.INSTANCE;
+    public DataType getOutputType(VerificationContext context) {
+        return context.getFieldType(fieldName, this);
     }
 
     @Override
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java
index 07c8dbeaa6b6..d4640086a311 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java
@@ -22,17 +22,23 @@ public JoinExpression(String delimiter) {
         this.delimiter = delimiter;
     }
 
-    public String getDelimiter() {
-        return delimiter;
+    public String getDelimiter() { return delimiter; }
+
+    @Override
+    protected void doVerify(VerificationContext context) {
+        DataType input = context.getCurrentType();
+        if (!(input instanceof ArrayDataType)) {
+            throw new VerificationException(this, "Expected Array input, got " + input.getName());
+        }
+        context.setCurrentType(createdOutputType());
     }
 
     @SuppressWarnings({ "unchecked" })
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
-        if (!(input instanceof Array)) {
+        FieldValue input = context.getCurrentValue();
+        if (!(input instanceof Array))
             throw new IllegalArgumentException("Expected Array input, got " + input.getDataType().getName());
-        }
         StringBuilder output = new StringBuilder();
         for (Iterator<FieldValue> it = ((Array)input).fieldValueIterator(); it.hasNext(); ) {
             output.append(it.next());
@@ -40,22 +46,11 @@ protected void doExecute(ExecutionContext context) {
                 output.append(delimiter);
             }
         }
-        context.setValue(new StringFieldValue(output.toString()));
+        context.setCurrentValue(new StringFieldValue(output.toString()));
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        DataType input = context.getValueType();
-        if (!(input instanceof ArrayDataType)) {
-            throw new VerificationException(this, "Expected Array input, got " + input.getName());
-        }
-        context.setValueType(createdOutputType());
-    }
-
-    @Override
-    public DataType createdOutputType() {
-        return DataType.STRING;
-    }
+    public DataType createdOutputType() { return DataType.STRING; }
 
     @Override
     public String toString() {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpression.java
index f4288e035f14..12fa802d59b1 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpression.java
@@ -19,19 +19,17 @@ public LiteralBoolExpression(boolean value) {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new BoolFieldValue(value));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new BoolFieldValue(value));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.BOOL;
-    }
+    public DataType createdOutputType() { return DataType.BOOL; }
 
     @Override
     public String toString() {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java
index 82accf6406d0..8cf304043bed 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java
@@ -16,24 +16,20 @@ public LowerCaseExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new StringFieldValue(toLowerCase(String.valueOf(context.getValue()))));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new StringFieldValue(toLowerCase(String.valueOf(context.getCurrentValue()))));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.STRING;
-    }
+    public DataType createdOutputType() { return DataType.STRING; }
 
     @Override
-    public String toString() {
-        return "lowercase";
-    }
+    public String toString() { return "lowercase"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java
index ad148f89d84c..e10e4f13294e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java
@@ -51,6 +51,7 @@ private static class Item {
             this.op = Objects.requireNonNull(op);
             this.exp = exp;
         }
+
     }
 
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
index fdfadf654007..8954951ce462 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
@@ -39,23 +39,24 @@ public NGramExpression(Linguistics linguistics, int gramSize) {
         this.gramSize = gramSize;
     }
 
-    public Linguistics getLinguistics() {
-        return linguistics;
-    }
+    public Linguistics getLinguistics() { return linguistics; }
+
+    public int getGramSize() { return gramSize; }
 
-    public int getGramSize() {
-        return gramSize;
+    @Override
+    protected void doVerify(VerificationContext context) {
+        // empty
     }
 
     @Override
     protected void doExecute(ExecutionContext context) {
-        StringFieldValue input = (StringFieldValue) context.getValue();
+        StringFieldValue input = (StringFieldValue) context.getCurrentValue();
         if (input.getSpanTree(SpanTrees.LINGUISTICS) != null) {
             // This expression is already executed for this input instance
             return;
         }
         StringFieldValue output = input.clone();
-        context.setValue(output);
+        context.setCurrentValue(output);
 
         SpanList spanList = output.setSpanTree(new SpanTree(SpanTrees.LINGUISTICS)).spanList();
         int lastPosition = 0;
@@ -86,11 +87,6 @@ private Span typedSpan(int from, int length, TokenType tokenType, SpanList spanL
         return (Span)spanList.span(from, length).annotate(AnnotationTypes.TOKEN_TYPE, tokenType.getValue());
     }
 
-    @Override
-    protected void doVerify(VerificationContext context) {
-        // empty
-    }
-
     @Override
     public DataType createdOutputType() {
         return null;
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java
index 0e6b77624cbb..d269fa1fd4a9 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java
@@ -22,33 +22,24 @@ public NormalizeExpression(Linguistics linguistics) {
         this.linguistics = linguistics;
     }
 
-    public Linguistics getLinguistics() {
-        return linguistics;
-    }
+    public Linguistics getLinguistics() { return linguistics; }
     
-    private static String escape(String str) {
-        StringBuilder buf = new StringBuilder();
-        for (char c : str.toCharArray()) {
-            if (c >= ' ') {
-                buf.append(c);
-            } else {
-                buf.append(String.format("U+%04X", (int)c));
-            }
-        }
-        return buf.toString();
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
     protected void doExecute(ExecutionContext context) {
         Transformer transformer = linguistics.getTransformer();
-        var orig = String.valueOf(context.getValue());
+        var orig = String.valueOf(context.getCurrentValue());
         if (orig.isEmpty()) {
             return; // must be a no-op for all linguistics/language combinations
         }
         var lang = context.resolveLanguage(linguistics);
         var transformed = transformer.accentDrop(orig, lang);
         try {
-            context.setValue(new StringFieldValue(transformed));
+            context.setCurrentValue(new StringFieldValue(transformed));
             return;
         } catch (IllegalArgumentException ex) {
             String msg = ("bad normalize, \n" +
@@ -57,13 +48,20 @@ protected void doExecute(ExecutionContext context) {
                           "transformed: >>> " + escape(transformed) + " <<<");
             logger.log(Level.SEVERE, msg);
         }
-        context.setValue(new StringFieldValue(transformer.accentDrop(String.valueOf(context.getValue()),
-                                                                     context.resolveLanguage(linguistics))));
+        context.setCurrentValue(new StringFieldValue(transformer.accentDrop(String.valueOf(context.getCurrentValue()),
+                                                                            context.resolveLanguage(linguistics))));
     }
 
-    @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    private static String escape(String str) {
+        StringBuilder buf = new StringBuilder();
+        for (char c : str.toCharArray()) {
+            if (c >= ' ') {
+                buf.append(c);
+            } else {
+                buf.append(String.format("U+%04X", (int)c));
+            }
+        }
+        return buf.toString();
     }
 
     @Override
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java
index 039f123a6e7c..b00b38454628 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java
@@ -20,29 +20,23 @@ public NowExpression(Timer timer) {
         this.timer = timer;
     }
 
-    public Timer getTimer() {
-        return timer;
-    }
+    public Timer getTimer() { return timer; }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new LongFieldValue(timer.currentTimeSeconds()));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new LongFieldValue(timer.currentTimeSeconds()));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.LONG;
-    }
+    public DataType createdOutputType() { return DataType.LONG; }
 
     @Override
-    public String toString() {
-        return "now";
-    }
+    public String toString() { return "now"; }
 
     @Override
     public boolean equals(Object obj) {
@@ -70,6 +64,7 @@ private static class SystemTimer implements Timer {
         public long currentTimeSeconds() {
             return System.currentTimeMillis() / 1000;
         }
+
     }
 
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java
index 91d88d929907..56531b3aae94 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java
@@ -29,9 +29,17 @@ public OptimizePredicateExpression() {
         this.optimizer = optimizer;
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        checkVariable(context, "arity", DataType.INT, true);
+        checkVariable(context, "lower_bound", DataType.LONG, false);
+        checkVariable(context, "upper_bound", DataType.LONG, false);
+        context.setCurrentType(DataType.PREDICATE);
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        PredicateFieldValue predicate = ((PredicateFieldValue) context.getValue()).clone();
+        PredicateFieldValue predicate = ((PredicateFieldValue) context.getCurrentValue()).clone();
         IntegerFieldValue arity = (IntegerFieldValue) context.getVariable("arity");
         LongFieldValue lower_bound = (LongFieldValue) context.getVariable("lower_bound");
         LongFieldValue upper_bound = (LongFieldValue) context.getVariable("upper_bound");
@@ -39,37 +47,24 @@ protected void doExecute(ExecutionContext context) {
         Long upper = upper_bound != null? upper_bound.getLong() : null;
         PredicateOptions options = new PredicateOptions(arity.getInteger(), lower, upper);
         predicate.setPredicate(optimizer.process(predicate.getPredicate(), options));
-        context.setValue(predicate);
-    }
-
-    @Override
-    protected void doVerify(VerificationContext context) {
-        checkVariable(context, "arity", DataType.INT, true);
-        checkVariable(context, "lower_bound", DataType.LONG, false);
-        checkVariable(context, "upper_bound", DataType.LONG, false);
-        context.setValueType(DataType.PREDICATE);
+        context.setCurrentValue(predicate);
     }
 
     private void checkVariable(VerificationContext ctx, String var, DataType type, boolean required) {
         DataType input = ctx.getVariable(var);
         if (input == null) {
-            if (required) {
+            if (required)
                 throw new VerificationException(this, "Variable '" + var + "' must be set");
-            }
         } else if (input != type) {
             throw new VerificationException(this, "Variable '" + var + "' must have type " + type.getName());
         }
     }
 
     @Override
-    public DataType createdOutputType() {
-        return null;
-    }
+    public DataType createdOutputType() { return null; }
 
     @Override
-    public String toString() {
-        return "optimize_predicate";
-    }
+    public String toString() { return "optimize_predicate"; }
 
     @Override
     public int hashCode() {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java
index 4320d25a0823..a050eee7413f 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java
@@ -22,23 +22,24 @@ public OutputExpression(String image, String fieldName) {
         this.fieldName = fieldName;
     }
 
-    public String getFieldName() {
-        return fieldName;
+    public String getFieldName() { return fieldName; }
+
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.tryOutputType(fieldName, context.getCurrentType(), this);
     }
 
     @Override
     protected void doExecute(ExecutionContext context) {
-        context.setOutputValue(this, fieldName, context.getValue());
+        context.setFieldValue(fieldName, context.getCurrentValue(), this);
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.tryOutputType(this, fieldName, context.getValueType());
-    }
+    public DataType createdOutputType() { return null; }
 
     @Override
-    public DataType createdOutputType() {
-        return null;
+    public DataType getInputType(VerificationContext context) {
+        return context.getFieldType(fieldName, this);
     }
 
     @Override
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/PackBitsExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/PackBitsExpression.java
new file mode 100644
index 000000000000..078639a8071b
--- /dev/null
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/PackBitsExpression.java
@@ -0,0 +1,95 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.indexinglanguage.expressions;
+
+import com.yahoo.document.DataType;
+import com.yahoo.document.TensorDataType;
+import com.yahoo.document.datatypes.TensorFieldValue;
+import com.yahoo.tensor.Tensor;
+import com.yahoo.tensor.TensorType;
+import com.yahoo.tensor.Tensors;
+
+import java.util.Optional;
+
+/**
+ * Converts any tensor containing only ones and zeroes into one where each consecutive 8 values in the
+ * dense dimension are packed into a single byte. As a consequence the output type of this is a tensor
+ * where the dense dimension is 1/8th as large.
+ *
+ * @author bratseth
+ */
+public class PackBitsExpression extends Expression  {
+
+    private TensorType outputTensorType;
+
+    /** Creates a pack_bits expression. */
+    public PackBitsExpression() {
+        super(TensorDataType.any());
+    }
+
+    @Override
+    public DataType setInputType(DataType inputType, VerificationContext context) {
+        super.setInputType(inputType, context);
+        if ( ! validType(inputType))
+            throw new IllegalArgumentException("pack_bits requires a tensor with one dense dimension, " +
+                                               "but got " + inputType);
+        outputTensorType = outputType(((TensorDataType)inputType).getTensorType());
+        return new TensorDataType(outputTensorType);
+    }
+
+    @Override
+    public DataType setOutputType(DataType outputType, VerificationContext context) {
+        super.setOutputType(outputType, context);
+        if ( ! validType(outputType))
+            throw new IllegalArgumentException("pack_bits produces a tensor with one dense dimension, " +
+                                               "but need " + outputType);
+        outputTensorType = ((TensorDataType)outputType).getTensorType();
+        return new TensorDataType(inputType(outputTensorType));
+    }
+
+    /** Returns whether this is a valid input or output from this. */
+    private boolean validType(DataType type) {
+        if ( ! (type instanceof TensorDataType tensorType)) return false;
+        if ( tensorType.getTensorType().indexedSubtype().dimensions().size() != 1) return false;
+        return true;
+    }
+
+    @Override
+    protected void doVerify(VerificationContext context) {}
+
+    @Override
+    protected void doExecute(ExecutionContext context) {
+        Optional<Tensor> tensor = ((TensorFieldValue)context.getCurrentValue()).getTensor();
+        if (tensor.isEmpty()) return;
+        Tensor packed = Tensors.packBits(tensor.get());
+        context.setCurrentValue(new TensorFieldValue(packed));
+    }
+
+    @Override
+    public DataType createdOutputType() { return new TensorDataType(outputTensorType); }
+
+    @Override
+    public String toString() { return "pack_bits"; }
+
+    @Override
+    public int hashCode() { return toString().hashCode(); }
+
+    @Override
+    public boolean equals(Object o) { return o instanceof PackBitsExpression; }
+
+    /** Returns the type this requires when producing the given output type. */
+    private TensorType inputType(TensorType givenType) {
+        var builder = new TensorType.Builder(TensorType.Value.INT8); // Any larger value type is also permissible
+        for (var d : givenType.dimensions())
+            builder.dimension(d.size().isPresent() ? d.withSize(d.size().get() * 8) : d);
+        return builder.build();
+    }
+
+    /** Returns the type this produces from the given input type. */
+    private TensorType outputType(TensorType givenType) {
+        var builder = new TensorType.Builder(TensorType.Value.INT8);
+        for (var d : givenType.dimensions())
+            builder.dimension(d.size().isPresent() ? d.withSize((int) Math.ceil(d.size().get() / 8.0)) : d);
+        return builder.build();
+    }
+
+}
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java
index 2f8917100a67..ade7cc72d149 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java
@@ -20,9 +20,7 @@ public ParenthesisExpression(Expression innerExp) {
         this.innerExp = innerExp;
     }
 
-    public Expression getInnerExpression() {
-        return innerExp;
-    }
+    public Expression getInnerExpression() { return innerExp; }
 
     @Override
     public ParenthesisExpression convertChildren(ExpressionConverter converter) {
@@ -35,13 +33,13 @@ public void setStatementOutput(DocumentType documentType, Field field) {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        innerExp.execute(context);
+    protected void doVerify(VerificationContext context) {
+        innerExp.verify(context);
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        innerExp.verify(context);
+    protected void doExecute(ExecutionContext context) {
+        innerExp.execute(context);
     }
 
     @Override
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java
index 2972d3ee3ccd..31a44172a180 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java
@@ -23,26 +23,22 @@ public RandomExpression(Integer max) {
         this.max = max;
     }
 
-    public Integer getMaxValue() {
-        return max;
-    }
+    public Integer getMaxValue() { return max; }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        int max;
-        max = Objects.requireNonNullElseGet(this.max, () -> Integer.parseInt(String.valueOf(context.getValue())));
-        context.setValue(new IntegerFieldValue(ThreadLocalRandom.current().nextInt(max)));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        int max;
+        max = Objects.requireNonNullElseGet(this.max, () -> Integer.parseInt(String.valueOf(context.getCurrentValue())));
+        context.setCurrentValue(new IntegerFieldValue(ThreadLocalRandom.current().nextInt(max)));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.INT;
-    }
+    public DataType createdOutputType() { return DataType.INT; }
 
     @Override
     public String toString() {
@@ -60,4 +56,5 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java
index 810ff261f2d3..bf241cf61784 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java
@@ -43,33 +43,33 @@ public ScriptExpression convertChildren(ExpressionConverter converter) {
                                             .toList());
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        DataType input = context.getCurrentType();
+        for (Expression exp : this)
+            context.setCurrentType(input).verify(exp);
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
+        FieldValue input = context.getCurrentValue();
         for (StatementExpression statement : this) {
             if (context.isComplete() ||
                 (statement.getInputFields().isEmpty() || containsAtLeastOneInputFrom(statement.getInputFields(), context))) {
-                context.setValue(input);
+                context.setCurrentValue(input);
                 context.execute(statement);
             }
         }
-        context.setValue(input);
+        context.setCurrentValue(input);
     }
 
     private boolean containsAtLeastOneInputFrom(List<String> inputFields, ExecutionContext context) {
         for (String inputField : inputFields)
-            if (context.getInputValue(inputField) != null)
+            if (context.getFieldValue(inputField) != null)
                 return true;
         return false;
     }
 
-    @Override
-    protected void doVerify(VerificationContext context) {
-        DataType input = context.getValueType();
-        for (Expression exp : this)
-            context.setValueType(input).execute(exp);
-    }
-
     private static DataType resolveInputType(Collection<? extends StatementExpression> list) {
         DataType prev = null;
         for (Expression exp : list) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java
index 9c92dd452c32..d465d0aed66f 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java
@@ -10,7 +10,6 @@
 import com.yahoo.vespa.objects.ObjectOperation;
 import com.yahoo.vespa.objects.ObjectPredicate;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -46,29 +45,29 @@ public void setStatementOutput(DocumentType documentType, Field field) {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
+    protected void doVerify(VerificationContext context) {
+        DataType input = context.getCurrentType();
         for (Pair<String, Expression> entry : cases) {
-            FieldValue val = context.getInputValue(entry.getFirst());
-            if (val != null) {
-                context.setValue(val).execute(entry.getSecond());
-                break;
+            DataType val = context.getFieldType(entry.getFirst(), this);
+            if (val == null) {
+                throw new VerificationException(this, "Field '" + entry.getFirst() + "' not found");
             }
+            context.setCurrentType(val).verify(entry.getSecond());
         }
-        context.setValue(input);
+        context.setCurrentType(input);
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        DataType input = context.getValueType();
+    protected void doExecute(ExecutionContext context) {
+        FieldValue input = context.getCurrentValue();
         for (Pair<String, Expression> entry : cases) {
-            DataType val = context.getInputType(this, entry.getFirst());
-            if (val == null) {
-                throw new VerificationException(this, "Field '" + entry.getFirst() + "' not found");
+            FieldValue val = context.getFieldValue(entry.getFirst());
+            if (val != null) {
+                context.setCurrentValue(val).execute(entry.getSecond());
+                break;
             }
-            context.setValueType(val).execute(entry.getSecond());
         }
-        context.setValueType(input);
+        context.setCurrentValue(input);
     }
 
     @Override
@@ -79,9 +78,7 @@ public void selectMembers(ObjectPredicate predicate, ObjectOperation operation)
     }
 
     @Override
-    public DataType createdOutputType() {
-        return null;
-    }
+    public DataType createdOutputType() { return null; }
 
     public List<Pair<String, Expression>> getCases() {
         return Collections.unmodifiableList(cases);
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java
index da5338af6a6f..8dbbc0c974d6 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java
@@ -14,25 +14,24 @@ public final class SetLanguageExpression extends Expression {
     public SetLanguageExpression() {
         super(DataType.STRING);
     }
-    @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setLanguage(Language.fromLanguageTag(String.valueOf(context.getValue())));
-    }
 
     @Override
     protected void doVerify(VerificationContext context) {
         // empty
     }
 
+    @Override
+    protected void doExecute(ExecutionContext context) {
+        context.setLanguage(Language.fromLanguageTag(String.valueOf(context.getCurrentValue())));
+    }
+
     @Override
     public DataType createdOutputType() {
         return null;
     }
 
     @Override
-    public String toString() {
-        return "set_language";
-    }
+    public String toString() { return "set_language"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java
index 4f30e0b066f0..b4c92fc695b1 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java
@@ -15,18 +15,11 @@ public SetVarExpression(String varName) {
         this.varName = varName;
     }
 
-    public String getVariableName() {
-        return varName;
-    }
-
-    @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setVariable(varName, context.getValue());
-    }
+    public String getVariableName() { return varName; }
 
     @Override
     protected void doVerify(VerificationContext context) {
-        DataType next = context.getValueType();
+        DataType next = context.getCurrentType();
         DataType prev = context.getVariable(varName);
         if (prev != null && !prev.equals(next)) {
             throw new VerificationException(this, "Attempting to assign conflicting types to variable '" + varName +
@@ -36,10 +29,13 @@ protected void doVerify(VerificationContext context) {
     }
 
     @Override
-    public DataType createdOutputType() {
-        return null;
+    protected void doExecute(ExecutionContext context) {
+        context.setVariable(varName, context.getCurrentValue());
     }
 
+    @Override
+    public DataType createdOutputType() { return null; }
+
     @Override
     public String toString() {
         return "set_var " + varName;
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SleepExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SleepExpression.java
index f7216fc1c975..cc43506539a1 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SleepExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SleepExpression.java
@@ -6,17 +6,22 @@
 
 /**
  * Utility expression that will sleep the amount of time given in the numeric field.
- * Non-numeric fields will be ignored
+ * Non-numeric fields will be ignored.
+ *
  * @author baldersheim
  */
 public final class SleepExpression extends Expression {
+
     public SleepExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) { }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue value = context.getValue();
+        FieldValue value = context.getCurrentValue();
         if (value instanceof NumericFieldValue num) {
             double napSecs = num.getNumber().doubleValue();
             long nanos = (long)(napSecs*1_000_000_000.0);
@@ -28,7 +33,6 @@ protected void doExecute(ExecutionContext context) {
         }
     }
 
-    @Override protected void doVerify(VerificationContext context) { }
     @Override public DataType createdOutputType() { return null; }
     @Override public String toString() { return "sleep"; }
     @Override public boolean equals(Object obj) { return obj instanceof SleepExpression; }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java
index f3a2b7ab4aee..7d36455ebce6 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java
@@ -1,6 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.indexinglanguage.expressions;
 
+import com.yahoo.document.ArrayDataType;
 import com.yahoo.document.DataType;
 import com.yahoo.document.datatypes.Array;
 import com.yahoo.document.datatypes.StringFieldValue;
@@ -20,13 +21,34 @@ public SplitExpression(String splitString) {
         this.splitPattern = Pattern.compile(splitString);
     }
 
-    public Pattern getSplitPattern() {
-        return splitPattern;
+    public Pattern getSplitPattern() { return splitPattern; }
+
+    @Override
+    public DataType setInputType(DataType input, VerificationContext context) {
+        super.setInputType(input, context);
+        // TODO: Activate type checking
+        // if (input != DataType.STRING)
+        //    throw new IllegalArgumentException("split requires a string input, but got " + input);
+        return new ArrayDataType(DataType.STRING);
+    }
+
+    @Override
+    public DataType setOutputType(DataType output, VerificationContext context) {
+        super.setOutputType(output, context);
+        // TODO: Activate type checking
+        // if ( ! (output instanceof ArrayDataType) && output.getNestedType() == DataType.STRING)
+        //    throw new IllegalArgumentException("split produces a string array, but needs " + output);
+        return DataType.STRING;
+    }
+
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
     protected void doExecute(ExecutionContext context) {
-        String input = String.valueOf(context.getValue());
+        String input = String.valueOf(context.getCurrentValue());
         Array<StringFieldValue> output = new Array<>(DataType.getArray(DataType.STRING));
         if (!input.isEmpty()) {
             String[] splits = splitPattern.split(input);
@@ -34,12 +56,7 @@ protected void doExecute(ExecutionContext context) {
                 output.add(new StringFieldValue(split));
             }
         }
-        context.setValue(output);
-    }
-
-    @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+        context.setCurrentValue(output);
     }
 
     @Override
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java
index f9d8002100f5..e8ed41df7b9c 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java
@@ -11,14 +11,16 @@
 import com.yahoo.vespa.indexinglanguage.parser.IndexingInput;
 import com.yahoo.vespa.indexinglanguage.parser.ParseException;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
+ * An indexing statement consisting of a list of indexing expressions, e.g "input foo | index | attribute".
+ *
  * @author Simon Thoresen Hult
  */
 public final class StatementExpression extends ExpressionList<Expression> {
@@ -29,12 +31,12 @@ public final class StatementExpression extends ExpressionList<Expression> {
     /** The name of the (last) output field this statement will write to, or null if none */
     private String outputField;
 
-    public StatementExpression(Expression... lst) {
-        this(Arrays.asList(lst)); //TODO Can contain null - necessary ?
+    public StatementExpression(Expression... list) {
+        this(Arrays.asList(list)); // TODO: Can contain null - necessary ?
     }
 
-    public StatementExpression(Iterable<Expression> lst) {
-        this(filterList(lst), null);
+    public StatementExpression(Iterable<Expression> list) {
+        this(filterList(list), null);
     }
 
     private StatementExpression(Iterable<Expression> list, Object unused) {
@@ -53,6 +55,37 @@ public StatementExpression convertChildren(ExpressionConverter converter) {
                                                .toList());
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        if (expressions().isEmpty()) return;
+
+        outputField = outputFieldName();
+        if (outputField != null)
+            context.setOutputField(outputField);
+
+        // Result input and output types:
+        // Some expressions can only determine their input from their output, and others only their output from
+        // their input. Therefore, we try resolving in both directions, which should always meet up to produce
+        // uniquely determined inputs and outputs of all expressions.
+        // forward:
+        int i = 0;
+        var inputType = getInputType(context); // A nested statement; input imposed from above
+        if (inputType == null) // otherwise the first expression will be an input deciding the type
+            inputType = expressions().get(i++).getOutputType(context);
+        while (i < expressions().size() && inputType != null)
+            inputType = expressions().get(i++).setInputType(inputType, context);
+        // reverse:
+        int j = expressions().size();
+        var outputType = getOutputType(context); // A nested statement; output imposed from above
+        if (outputType == null) // otherwise the last expression will be an output deciding the type
+            outputType = expressions().get(--j).getInputType(context);
+        while (--j >= 0 && outputType != null)
+            outputType = expressions().get(j).setOutputType(outputType, context);
+
+        for (Expression expression : expressions())
+            context.verify(expression);
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         for (Expression expression : this) {
@@ -60,16 +93,12 @@ protected void doExecute(ExecutionContext context) {
         }
     }
 
-    @Override
-    protected void doVerify(VerificationContext context) {
+    private String outputFieldName() {
         for (Expression expression : this) {
-            if (expression instanceof OutputExpression)
-                outputField = ((OutputExpression)expression).getFieldName();
+            if (expression instanceof OutputExpression output)
+                return output.getFieldName();
         }
-        if (outputField != null)
-            context.setOutputField(outputField);
-        for (Expression expression : this)
-            context.execute(expression);
+        return null;
     }
 
     private static DataType resolveInputType(Iterable<Expression> expressions) {
@@ -115,16 +144,16 @@ public static StatementExpression newInstance(ScriptParserContext config) throws
         return ScriptParser.parseStatement(config);
     }
 
-    private static List<Expression> filterList(Iterable<Expression> lst) {
-        List<Expression> ret = new LinkedList<>();
-        for (Expression exp : lst) {
-            if (exp instanceof StatementExpression) {
-                ret.addAll(filterList((StatementExpression)exp));
-            } else if (exp != null) {
-                ret.add(exp);
+    private static List<Expression> filterList(Iterable<Expression> list) {
+        List<Expression> filtered = new ArrayList<>();
+        for (Expression expression : list) {
+            if (expression instanceof StatementExpression statement) {
+                filtered.addAll(filterList(statement));
+            } else if (expression != null) {
+                filtered.add(expression);
             }
         }
-        return ret;
+        return filtered;
     }
 
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java
index ea9ed4098953..00765e0b263c 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java
@@ -22,24 +22,20 @@ public SubstringExpression(int from, int to) {
         this.to = to;
     }
 
-    public int getFrom() {
-        return from;
-    }
+    public int getFrom() { return from; }
 
-    public int getTo() {
-        return to;
-    }
+    public int getTo() { return to; }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        String input = String.valueOf(context.getValue());
-        String substring = Text.substringByCodepoints(input, from, to);
-        context.setValue(new StringFieldValue(substring));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        String input = String.valueOf(context.getCurrentValue());
+        String substring = Text.substringByCodepoints(input, from, to);
+        context.setCurrentValue(new StringFieldValue(substring));
     }
 
     @Override
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java
index 34849096b366..120f08847f5e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java
@@ -33,6 +33,16 @@ public <T extends Expression> SwitchExpression(Map<String, T> cases, Expression
         this.cases.putAll(cases);
     }
 
+    public boolean isEmpty() {
+        return defaultExp == null && cases.isEmpty();
+    }
+
+    public Map<String, Expression> getCases() {
+        return Collections.unmodifiableMap(cases);
+    }
+
+    public Expression getDefaultExpression() { return defaultExp; }
+
     @Override
     public SwitchExpression convertChildren(ExpressionConverter converter) {
         var convertedCases = new LinkedHashMap<String, Expression>();
@@ -44,18 +54,6 @@ public SwitchExpression convertChildren(ExpressionConverter converter) {
         return new SwitchExpression(convertedCases, converter.branch().convert(defaultExp));
     }
 
-    public boolean isEmpty() {
-        return defaultExp == null && cases.isEmpty();
-    }
-
-    public Map<String, Expression> getCases() {
-        return Collections.unmodifiableMap(cases);
-    }
-
-    public Expression getDefaultExpression() {
-        return defaultExp;
-    }
-
     @Override
     public void setStatementOutput(DocumentType documentType, Field field) {
         defaultExp.setStatementOutput(documentType, field);
@@ -63,9 +61,26 @@ public void setStatementOutput(DocumentType documentType, Field field) {
             expression.setStatementOutput(documentType, field);
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        DataType input = context.getCurrentType();
+        if (input == null) {
+            throw new VerificationException(this, "Expected " + DataType.STRING.getName() + " input, but no input is specified");
+        }
+        if (input != DataType.STRING) {
+            throw new VerificationException(this, "Expected " + DataType.STRING.getName() + " input, got " +
+                                                  input.getName());
+        }
+        for (Expression exp : cases.values()) {
+            context.setCurrentType(input).verify(exp);
+        }
+        context.setCurrentType(input).verify(defaultExp);
+        context.setCurrentType(input);
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
+        FieldValue input = context.getCurrentValue();
         Expression exp = null;
         if (input != null) {
             if (!(input instanceof StringFieldValue)) {
@@ -80,7 +95,7 @@ protected void doExecute(ExecutionContext context) {
         if (exp != null) {
             exp.execute(context);
         }
-        context.setValue(input);
+        context.setCurrentValue(input);
     }
 
     @Override
@@ -92,26 +107,7 @@ public void selectMembers(ObjectPredicate predicate, ObjectOperation operation)
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        DataType input = context.getValueType();
-        if (input == null) {
-            throw new VerificationException(this, "Expected " + DataType.STRING.getName() + " input, but no input is specified");
-        }
-        if (input != DataType.STRING) {
-            throw new VerificationException(this, "Expected " + DataType.STRING.getName() + " input, got " +
-                                                  input.getName());
-        }
-        for (Expression exp : cases.values()) {
-            context.setValueType(input).execute(exp);
-        }
-        context.setValueType(input).execute(defaultExp);
-        context.setValueType(input);
-    }
-
-    @Override
-    public DataType createdOutputType() {
-        return null;
-    }
+    public DataType createdOutputType() { return null; }
 
     @Override
     public String toString() {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java
index c74e408e05be..b3e5e5c23f82 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java
@@ -13,24 +13,20 @@ public ThisExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
+    protected void doVerify(VerificationContext context) {
         // empty
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
+    protected void doExecute(ExecutionContext context) {
         // empty
     }
 
     @Override
-    public DataType createdOutputType() {
-        return UnresolvedDataType.INSTANCE;
-    }
+    public DataType createdOutputType() { return UnresolvedDataType.INSTANCE; }
 
     @Override
-    public String toString() {
-        return "this";
-    }
+    public String toString() { return "this"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java
index 779add656c01..303458a19ff7 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java
@@ -15,22 +15,22 @@ public ToArrayExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(DataType.getArray(context.getCurrentType()));
+    }
+
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
+        FieldValue input = context.getCurrentValue();
         DataType inputType = input.getDataType();
 
         ArrayDataType outputType = DataType.getArray(inputType);
         Array output = outputType.createFieldValue();
         output.add(input);
 
-        context.setValue(output);
-    }
-
-    @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(DataType.getArray(context.getValueType()));
+        context.setCurrentValue(output);
     }
 
     @Override
@@ -39,9 +39,7 @@ public DataType createdOutputType() {
     }
 
     @Override
-    public String toString() {
-        return "to_array";
-    }
+    public String toString() { return "to_array"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolExpression.java
index fa9d93efd031..3e0523995322 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolExpression.java
@@ -16,9 +16,14 @@ public ToBoolExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        context.setValue(new BoolFieldValue(toBooleanValue(context.getValue())));
+        context.setCurrentValue(new BoolFieldValue(toBooleanValue(context.getCurrentValue())));
     }
 
     private boolean toBooleanValue(FieldValue value) {
@@ -30,19 +35,10 @@ private boolean toBooleanValue(FieldValue value) {
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
-    }
-
-    @Override
-    public DataType createdOutputType() {
-        return DataType.BOOL;
-    }
+    public DataType createdOutputType() { return DataType.BOOL; }
 
     @Override
-    public String toString() {
-        return "to_bool";
-    }
+    public String toString() { return "to_bool"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java
index 260138364681..1606a9a70f62 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java
@@ -14,24 +14,20 @@ public ToByteExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new ByteFieldValue(Byte.valueOf(String.valueOf(context.getValue()))));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new ByteFieldValue(Byte.valueOf(String.valueOf(context.getCurrentValue()))));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.BYTE;
-    }
+    public DataType createdOutputType() { return DataType.BYTE; }
 
     @Override
-    public String toString() {
-        return "to_byte";
-    }
+    public String toString() { return "to_byte"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java
index 7487c001e5bc..4f0e75c3f770 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java
@@ -14,24 +14,20 @@ public ToDoubleExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new DoubleFieldValue(Double.valueOf(String.valueOf(context.getValue()))));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new DoubleFieldValue(Double.valueOf(String.valueOf(context.getCurrentValue()))));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.DOUBLE;
-    }
+    public DataType createdOutputType() { return DataType.DOUBLE; }
 
     @Override
-    public String toString() {
-        return "to_double";
-    }
+    public String toString() { return "to_double"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToEpochSecondExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToEpochSecondExpression.java
index ac3735188f4a..37032852b92e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToEpochSecondExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToEpochSecondExpression.java
@@ -10,33 +10,29 @@
  *
  * @author bergum
  */
-
 public class ToEpochSecondExpression extends Expression {
+
     public ToEpochSecondExpression() {
         super(DataType.STRING); //only accept string input
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        String inputString = String.valueOf(context.getValue());
-        long epochTime =  Instant.parse(inputString).getEpochSecond();
-        context.setValue(new LongFieldValue(epochTime));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        String inputString = String.valueOf(context.getCurrentValue());
+        long epochTime =  Instant.parse(inputString).getEpochSecond();
+        context.setCurrentValue(new LongFieldValue(epochTime));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.LONG;
-    }
+    public DataType createdOutputType() { return DataType.LONG; }
 
     @Override
-    public String toString() {
-        return "to_epoch_second";
-    }
+    public String toString() { return "to_epoch_second"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java
index d61a04350934..91b51e8b7e34 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java
@@ -14,24 +14,20 @@ public ToFloatExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new FloatFieldValue(Float.valueOf(String.valueOf(context.getValue()))));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new FloatFieldValue(Float.valueOf(String.valueOf(context.getCurrentValue()))));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.FLOAT;
-    }
+    public DataType createdOutputType() { return DataType.FLOAT; }
 
     @Override
-    public String toString() {
-        return "to_float";
-    }
+    public String toString() { return "to_float"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java
index 1efa0542e8c0..cbf1ff949ce8 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java
@@ -14,24 +14,20 @@ public ToIntegerExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new IntegerFieldValue(Integer.valueOf(String.valueOf(context.getValue()))));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new IntegerFieldValue(Integer.valueOf(String.valueOf(context.getCurrentValue()))));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.INT;
-    }
+    public DataType createdOutputType() { return DataType.INT; }
 
     @Override
-    public String toString() {
-        return "to_int";
-    }
+    public String toString() { return "to_int"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java
index d7ffee3cdf6b..dc601a9e2dd3 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java
@@ -14,24 +14,20 @@ public ToLongExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new LongFieldValue(Long.valueOf(String.valueOf(context.getValue()))));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new LongFieldValue(Long.valueOf(String.valueOf(context.getCurrentValue()))));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.LONG;
-    }
+    public DataType createdOutputType() { return DataType.LONG; }
 
     @Override
-    public String toString() {
-        return "to_long";
-    }
+    public String toString() { return "to_long"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java
index 7e4b61ceda32..0d4bafaf8ed5 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java
@@ -14,24 +14,20 @@ public ToPositionExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(PositionDataType.fromString(String.valueOf(context.getValue())));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(PositionDataType.fromString(String.valueOf(context.getCurrentValue())));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return PositionDataType.INSTANCE;
-    }
+    public DataType createdOutputType() { return PositionDataType.INSTANCE; }
 
     @Override
-    public String toString() {
-        return "to_pos";
-    }
+    public String toString() { return "to_pos"; }
 
     @Override
     public boolean equals(Object obj) {
@@ -42,5 +38,6 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java
index 11e13477d62a..d1209e59710b 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java
@@ -14,24 +14,20 @@ public ToStringExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new StringFieldValue(String.valueOf(context.getValue())));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new StringFieldValue(String.valueOf(context.getCurrentValue())));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.STRING;
-    }
+    public DataType createdOutputType() { return DataType.STRING; }
 
     @Override
-    public String toString() {
-        return "to_string";
-    }
+    public String toString() { return "to_string"; }
 
     @Override
     public boolean equals(Object obj) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java
index 1154bf39c05d..6ed50759e253 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java
@@ -20,36 +20,30 @@ public ToWsetExpression(boolean createIfNonExistent, boolean removeIfZero) {
         this.removeIfZero = removeIfZero;
     }
 
-    public boolean getCreateIfNonExistent() {
-        return createIfNonExistent;
-    }
+    public boolean getCreateIfNonExistent() { return createIfNonExistent; }
+
+    public boolean getRemoveIfZero() { return removeIfZero; }
 
-    public boolean getRemoveIfZero() {
-        return removeIfZero;
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(DataType.getWeightedSet(context.getCurrentType(), createIfNonExistent, removeIfZero));
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     protected void doExecute(ExecutionContext context) {
-        FieldValue input = context.getValue();
+        FieldValue input = context.getCurrentValue();
         DataType inputType = input.getDataType();
 
         WeightedSetDataType outputType = DataType.getWeightedSet(inputType, createIfNonExistent, removeIfZero);
         WeightedSet output = outputType.createFieldValue();
         output.add(input);
 
-        context.setValue(output);
-    }
-
-    @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(DataType.getWeightedSet(context.getValueType(), createIfNonExistent, removeIfZero));
+        context.setCurrentValue(output);
     }
 
     @Override
-    public DataType createdOutputType() {
-        return UnresolvedDataType.INSTANCE;
-    }
+    public DataType createdOutputType() { return UnresolvedDataType.INSTANCE; }
 
     @Override
     public String toString() {
@@ -60,24 +54,16 @@ public String toString() {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof ToWsetExpression)) {
-            return false;
-        }
-        ToWsetExpression rhs = (ToWsetExpression)obj;
-        if (createIfNonExistent != rhs.createIfNonExistent) {
-            return false;
-        }
-        if (removeIfZero != rhs.removeIfZero) {
-            return false;
-        }
+        if (!(obj instanceof ToWsetExpression rhs)) return false;
+
+        if (createIfNonExistent != rhs.createIfNonExistent) return false;
+        if (removeIfZero != rhs.removeIfZero) return false;
         return true;
     }
 
     @Override
     public int hashCode() {
-        return getClass().hashCode() +
-               createIfNonExistent.hashCode() +
-               removeIfZero.hashCode();
+        return getClass().hashCode() + createIfNonExistent.hashCode() + removeIfZero.hashCode();
     }
 
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java
index a3c404e50c39..64d6c0a5a199 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java
@@ -23,19 +23,20 @@ public TokenizeExpression(Linguistics linguistics, AnnotatorConfig config) {
         this.config = config;
     }
 
-    public Linguistics getLinguistics() {
-        return linguistics;
-    }
+    public Linguistics getLinguistics() { return linguistics; }
+
+    public AnnotatorConfig getConfig() { return config; }
 
-    public AnnotatorConfig getConfig() {
-        return config;
+    @Override
+    protected void doVerify(VerificationContext context) {
+        // empty
     }
 
     @Override
     protected void doExecute(ExecutionContext context) {
-        StringFieldValue input = (StringFieldValue)context.getValue();
+        StringFieldValue input = (StringFieldValue)context.getCurrentValue();
         StringFieldValue output = input.clone();
-        context.setValue(output);
+        context.setCurrentValue(output);
 
         AnnotatorConfig cfg = new AnnotatorConfig(config);
         Language lang = context.resolveLanguage(linguistics);
@@ -47,14 +48,7 @@ protected void doExecute(ExecutionContext context) {
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        // empty
-    }
-
-    @Override
-    public DataType createdOutputType() {
-        return null;
-    }
+    public DataType createdOutputType() { return null; }
 
     @Override
     public String toString() {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java
index 3722791aa33d..78f89fabe460 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java
@@ -14,30 +14,25 @@ public TrimExpression() {
     }
 
     @Override
-    protected void doExecute(ExecutionContext context) {
-        context.setValue(new StringFieldValue(String.valueOf(context.getValue()).trim()));
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
+    protected void doExecute(ExecutionContext context) {
+        context.setCurrentValue(new StringFieldValue(String.valueOf(context.getCurrentValue()).trim()));
     }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.STRING;
-    }
+    public DataType createdOutputType() { return DataType.STRING; }
 
     @Override
-    public String toString() {
-        return "trim";
-    }
+    public String toString() { return "trim"; }
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof TrimExpression)) {
-            return false;
-        }
+        if (!(obj instanceof TrimExpression)) return false;
+
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/UnresolvedFieldValue.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/UnresolvedFieldValue.java
index f973f6a2fb82..401b3b0978c0 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/UnresolvedFieldValue.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/UnresolvedFieldValue.java
@@ -22,9 +22,7 @@ private static class Factory extends PrimitiveDataType.Factory {
     public static PrimitiveDataType.Factory getFactory() { return new Factory(); }
 
     @Override
-    public DataType getDataType() {
-        return UnresolvedDataType.INSTANCE;
-    }
+    public DataType getDataType() { return UnresolvedDataType.INSTANCE; }
 
     @Override
     @Deprecated
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java
index a2926fb90398..ae49130f1ce7 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContext.java
@@ -9,69 +9,69 @@
 /**
  * @author Simon Thoresen Hult
  */
-public class VerificationContext implements FieldTypeAdapter, Cloneable {
+public class VerificationContext {
 
     private final Map<String, DataType> variables = new HashMap<>();
-    private final FieldTypeAdapter adapter;
-    private DataType value;
+    private final FieldTypeAdapter fieldType;
+    private DataType currentType;
     private String outputField;
 
     public VerificationContext() {
-        this.adapter = null;
+        this(null);
     }
 
-    public VerificationContext(FieldTypeAdapter adapter) {
-        this.adapter = adapter;
+    public VerificationContext(FieldTypeAdapter field) {
+        this.fieldType = field;
     }
 
-    public VerificationContext execute(Expression exp) {
-        if (exp != null) {
-            exp.verify(this);
-        }
+    public VerificationContext verify(Expression expression) {
+        if (expression != null)
+            expression.verify(this);
         return this;
     }
 
-    @Override
-    public DataType getInputType(Expression exp, String fieldName) {
-        return adapter.getInputType(exp, fieldName);
+    /** Returns the type of the field processed by this. */
+    public DataType getFieldType(Expression expression) {
+        return fieldType.getInputType(expression, getOutputField());
     }
 
-    @Override
-    public void tryOutputType(Expression exp, String fieldName, DataType valueType) {
-        adapter.tryOutputType(exp, fieldName, valueType);
+    /** Returns the type of the given field. */
+    public DataType getFieldType(String fieldName, Expression expression) {
+        return fieldType.getInputType(expression, fieldName);
     }
 
-    public DataType getVariable(String name) {
-        return variables.get(name);
+    public void tryOutputType(String fieldName, DataType valueType, Expression expression) {
+        fieldType.tryOutputType(expression, fieldName, valueType);
     }
 
-    public VerificationContext setVariable(String name, DataType value) {
-        variables.put(name, value);
+    /** Returns the current value type */
+    public DataType getCurrentType() { return currentType; }
+
+    /** Returns the current value type */
+    public VerificationContext setCurrentType(DataType value) {
+        this.currentType = value;
         return this;
     }
 
-    public DataType getValueType() {
-        return value;
-    }
+    public DataType getVariable(String name) { return variables.get(name); }
 
-    /** Sets the output value type */
-    public VerificationContext setValueType(DataType value) {
-        this.value = value;
+    public VerificationContext setVariable(String name, DataType value) {
+        variables.put(name, value);
         return this;
     }
 
-    /** Sets the name of the (last) output field of the statement this is executed as a part of */
-    public void setOutputField(String outputField) { this.outputField = outputField; }
-
     /**
      * Returns the name of the (last) output field of the statement this is executed as a part of,
      * or null if none or not yet verified
      */
     public String getOutputField() { return outputField; }
 
+    /** Sets the name of the (last) output field of the statement this is executed as a part of */
+    public void setOutputField(String outputField) { this.outputField = outputField; }
+
     public VerificationContext clear() {
         variables.clear();
-        value = null;
+        currentType = null;
         return this;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationException.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationException.java
index b2462b738210..cfc7273d0901 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationException.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationException.java
@@ -20,19 +20,15 @@ public VerificationException(Expression exp, String msg) {
         }
     }
 
-
     public VerificationException(Class<?> exp, String msg) {
         super(msg);
         this.type = exp;
         this.exp = exp.getName();
     }
 
-    public String getExpression() {
-        return exp;
-    }
-    public Class<?> getExpressionType() {
-        return type;
-    }
+    public String getExpression() { return exp; }
+
+    public Class<?> getExpressionType() { return type; }
 
     @Override
     public String toString() {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java
index 4ad1fc79790c..9d6826ba2535 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java
@@ -17,15 +17,20 @@ public ZCurveExpression() {
         super(PositionDataType.INSTANCE);
     }
 
+    @Override
+    protected void doVerify(VerificationContext context) {
+        context.setCurrentType(createdOutputType());
+    }
+
     @Override
     protected void doExecute(ExecutionContext context) {
-        Struct input = ((Struct) context.getValue());
+        Struct input = ((Struct) context.getCurrentValue());
         Integer x = getFieldValue(input, PositionDataType.FIELD_X);
         Integer y = getFieldValue(input, PositionDataType.FIELD_Y);
         if (x != null && y != null) {
-            context.setValue(new LongFieldValue(ZCurve.encode(x, y)));
+            context.setCurrentValue(new LongFieldValue(ZCurve.encode(x, y)));
         } else {
-            context.setValue(DataType.LONG.createFieldValue());
+            context.setCurrentValue(DataType.LONG.createFieldValue());
         }
     }
 
@@ -35,25 +40,14 @@ private static Integer getFieldValue(Struct struct, String fieldName) {
     }
 
     @Override
-    protected void doVerify(VerificationContext context) {
-        context.setValueType(createdOutputType());
-    }
+    public DataType createdOutputType() { return DataType.LONG; }
 
     @Override
-    public DataType createdOutputType() {
-        return DataType.LONG;
-    }
-
-    @Override
-    public String toString() {
-        return "zcurve";
-    }
+    public String toString() { return "zcurve"; }
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof ZCurveExpression)) {
-            return false;
-        }
+        if (!(obj instanceof ZCurveExpression)) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/javacc/IndexingParser.jj b/indexinglanguage/src/main/javacc/IndexingParser.jj
index 09aa3829ab91..fbf460ae6f6c 100644
--- a/indexinglanguage/src/main/javacc/IndexingParser.jj
+++ b/indexinglanguage/src/main/javacc/IndexingParser.jj
@@ -149,6 +149,7 @@ TOKEN :
     <ATTRIBUTE: "attribute"> |
     <BASE64_DECODE: "base64decode"> |
     <BASE64_ENCODE: "base64encode"> |
+    <BINARIZE: "binarize" > |
     <BUSY_WAIT: "busy_wait"> |
     <CASE: "case"> |
     <CASE_DEFAULT: "default"> |
@@ -179,6 +180,7 @@ TOKEN :
     <NORMALIZE: "normalize"> |
     <NOW: "now"> |
     <OPTIMIZE_PREDICATE: "optimize_predicate"> |
+    <PACK_BITS: "pack_bits" > |
     <PASSTHROUGH: "passthrough"> |
     <RANDOM: "random"> |
     <REMOVE_IF_ZERO: "remove_if_zero"> |
@@ -208,7 +210,6 @@ TOKEN :
     <ZCURVE: "zcurve"> |
     <TRUE: "true" > |
     <FALSE: "false" > |
-    <BINARIZE: "binarize" > |
     <UNDERSCORE: "_"> |
     <IDENTIFIER: ["a"-"z","A"-"Z", "_"] (["a"-"z","A"-"Z","0"-"9","_","-"])*>
 }
@@ -326,6 +327,7 @@ Expression value() :
       val = normalizeExp()          |
       val = nowExp()                |
       val = optimizePredicateExp()  |
+      val = packBitsExp()           |
       val = passthroughExp()        |
       val = randomExp()             |
       val = script()                |
@@ -570,6 +572,12 @@ Expression optimizePredicateExp() : { }
     { return new OptimizePredicateExpression(); }
 }
 
+Expression packBitsExp() : { }
+{
+    ( <PACK_BITS> )
+    { return new PackBitsExpression(); }
+}
+
 Expression passthroughExp() :
 {
     String val = defaultFieldName;
@@ -846,6 +854,7 @@ String identifier() :
         <NORMALIZE>              |
         <NOW>                    |
         <OPTIMIZE_PREDICATE>     |
+        <PACK_BITS>              |
         <PASSTHROUGH>            |
         <RANDOM>                 |
         <REMOVE_IF_ZERO>         |
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/EmbeddingScriptTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/EmbeddingScriptTestCase.java
index 0b0b00498860..b46232f0f2e1 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/EmbeddingScriptTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/EmbeddingScriptTestCase.java
@@ -15,6 +15,7 @@
 import com.yahoo.vespa.indexinglanguage.expressions.ExecutionContext;
 import com.yahoo.vespa.indexinglanguage.expressions.VerificationContext;
 import com.yahoo.vespa.indexinglanguage.expressions.VerificationException;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Map;
@@ -59,6 +60,12 @@ public void testEmbedAndBinarize() {
         tester.testStatement("input myText | embed | binarize 3.0 | attribute 'myTensor'", "input text", "[0, 0, 0, 1]");
     }
 
+    @Test
+    public void testEmbedBinarizeAndPack_bits() {
+        var tester = new EmbeddingScriptTester(Map.of("emb1", new EmbeddingScriptTester.MockIndexedEmbedder("myDocument.myTensor", -111)));
+        tester.testStatement("input myText | embed | binarize | pack_bits | attribute 'myTensor'", "input text", "tensor<int8>(x[2])", "[58, 192]");
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     public void testArrayEmbed() {
@@ -84,7 +91,7 @@ public void testArrayEmbed() {
         assertEquals(new ArrayDataType(new TensorDataType(tensorType)), expression.verify(verificationContext));
 
         ExecutionContext context = new ExecutionContext(adapter);
-        context.setValue(array);
+        context.setCurrentValue(array);
         expression.execute(context);
         assertTrue(adapter.values.containsKey("myTensorArray"));
         var tensorArray = (Array<TensorFieldValue>)adapter.values.get("myTensorArray");
@@ -121,7 +128,7 @@ public void testArrayEmbedWithConcatenation() {
         assertEquals(new TensorDataType(tensorType), expression.verify(verificationContext));
 
         ExecutionContext context = new ExecutionContext(adapter);
-        context.setValue(array);
+        context.setCurrentValue(array);
         expression.execute(context);
         assertTrue(adapter.values.containsKey("mySparseTensor"));
         var sparseTensor = (TensorFieldValue)adapter.values.get("mySparseTensor");
@@ -154,7 +161,7 @@ public void testArrayEmbedTo2dMixedTensor() {
         assertEquals(new TensorDataType(tensorType), expression.verify(verificationContext));
 
         ExecutionContext context = new ExecutionContext(adapter);
-        context.setValue(array);
+        context.setCurrentValue(array);
         expression.execute(context);
         assertTrue(adapter.values.containsKey("mySparseTensor"));
         var sparseTensor = (TensorFieldValue)adapter.values.get("mySparseTensor");
@@ -185,7 +192,7 @@ public void testArrayEmbedTo3dMixedTensor() {
         assertEquals(new TensorDataType(tensorType), expression.verify(new VerificationContext(adapter)));
 
         ExecutionContext context = new ExecutionContext(adapter);
-        context.setValue(array);
+        context.setCurrentValue(array);
         expression.execute(context);
         assertTrue(adapter.values.containsKey("mySparseTensor"));
         var sparseTensor = (TensorFieldValue)adapter.values.get("mySparseTensor");
@@ -289,7 +296,7 @@ public void testEmbedToSparseTensor() {
         assertEquals(new TensorDataType(tensorType), expression.verify(verificationContext));
 
         ExecutionContext context = new ExecutionContext(adapter);
-        context.setValue(text);
+        context.setCurrentValue(text);
         expression.execute(context);
         assertTrue(adapter.values.containsKey("mySparseTensor"));
         var sparseTensor = (TensorFieldValue)adapter.values.get("mySparseTensor");
@@ -345,7 +352,7 @@ public void testArrayEmbedTo2MappedTensor() {
         assertEquals(new TensorDataType(tensorType), expression.verify(new VerificationContext(adapter)));
 
         ExecutionContext context = new ExecutionContext(adapter);
-        context.setValue(array);
+        context.setCurrentValue(array);
         expression.execute(context);
         assertTrue(adapter.values.containsKey("my2DSparseTensor"));
         var sparse2DTensor = (TensorFieldValue)adapter.values.get("my2DSparseTensor");
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/EmbeddingScriptTester.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/EmbeddingScriptTester.java
index b75834f1a163..c4a53c1af683 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/EmbeddingScriptTester.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/EmbeddingScriptTester.java
@@ -32,8 +32,12 @@ public EmbeddingScriptTester(Map<String, Embedder> embedders) {
     }
 
     public void testStatement(String expressionString, String input, String expected) {
+        testStatement(expressionString, input, "tensor(d[4])", expected);
+    }
+
+    public void testStatement(String expressionString, String input, String targetTensorType, String expected) {
         var expression = expressionFrom(expressionString);
-        TensorType tensorType = TensorType.fromSpec("tensor(d[4])");
+        TensorType tensorType = TensorType.fromSpec(targetTensorType);
 
         SimpleTestAdapter adapter = new SimpleTestAdapter();
         adapter.createField(new Field("myText", DataType.STRING));
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java
index c4bd69663df7..2a145ae79e3f 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java
@@ -6,23 +6,14 @@
 import com.yahoo.document.Document;
 import com.yahoo.document.DocumentType;
 import com.yahoo.document.Field;
-import com.yahoo.document.TensorDataType;
 import com.yahoo.document.datatypes.Array;
 import com.yahoo.document.datatypes.BoolFieldValue;
 import com.yahoo.document.datatypes.IntegerFieldValue;
 import com.yahoo.document.datatypes.StringFieldValue;
-import com.yahoo.document.datatypes.TensorFieldValue;
-import com.yahoo.language.process.Embedder;
-import com.yahoo.language.simple.SimpleLinguistics;
-import com.yahoo.tensor.Tensor;
-import com.yahoo.tensor.TensorType;
 import com.yahoo.vespa.indexinglanguage.expressions.*;
 import com.yahoo.vespa.indexinglanguage.parser.ParseException;
 import org.junit.Test;
 
-import java.util.List;
-import java.util.Map;
-
 import static org.junit.Assert.*;
 
 /**
@@ -118,7 +109,7 @@ public void testIntHash() throws ParseException {
         assertEquals(DataType.INT, expression.verify(verificationContext));
 
         ExecutionContext context = new ExecutionContext(adapter);
-        context.setValue(new StringFieldValue("input text"));
+        context.setCurrentValue(new StringFieldValue("input text"));
         expression.execute(context);
         assertTrue(adapter.values.containsKey("myInt"));
         assertEquals(-1425622096, adapter.values.get("myInt").getWrappedValue());
@@ -144,7 +135,7 @@ public void testIntArrayHash() throws ParseException {
         assertEquals(new ArrayDataType(DataType.INT), expression.verify(verificationContext));
 
         ExecutionContext context = new ExecutionContext(adapter);
-        context.setValue(array);
+        context.setCurrentValue(array);
         expression.execute(context);
         assertTrue(adapter.values.containsKey("myIntArray"));
         var intArray = (Array<IntegerFieldValue>)adapter.values.get("myIntArray");
@@ -168,7 +159,7 @@ public void testLongHash() throws ParseException {
         assertEquals(DataType.LONG, expression.verify(verificationContext));
 
         ExecutionContext context = new ExecutionContext(adapter);
-        context.setValue(new StringFieldValue("input text"));
+        context.setCurrentValue(new StringFieldValue("input text"));
         expression.execute(context);
         assertTrue(adapter.values.containsKey("myLong"));
         assertEquals(7678158186624760752L, adapter.values.get("myLong").getWrappedValue());
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleTestAdapter.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleTestAdapter.java
index 07c6301339bb..458e1337eef0 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleTestAdapter.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/SimpleTestAdapter.java
@@ -17,8 +17,8 @@
  */
 public class SimpleTestAdapter implements FieldValueAdapter {
 
-    final Map<String, DataType> types = new HashMap<>();
-    final Map<String, FieldValue> values = new HashMap<>();
+    public final Map<String, DataType> types = new HashMap<>();
+    public final Map<String, FieldValue> values = new HashMap<>();
 
     public SimpleTestAdapter(Field... fields) {
         for (Field field : fields) {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticTestCase.java
index f7dafebba945..bee0add22c07 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticTestCase.java
@@ -170,7 +170,7 @@ private void assertType(DataType lhs, Operator op, DataType rhs, DataType expect
     private static FieldValue evaluate(Expression lhs, Operator op, Expression rhs) {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         new ArithmeticExpression(lhs, op, rhs).execute(ctx);
-        return ctx.getValue();
+        return ctx.getCurrentValue();
     }
 
     private static ArithmeticExpression newArithmetic(long lhs, Operator op, long rhs) {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeTestCase.java
index 08a0d8353a70..2d4f7afc6dc2 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeTestCase.java
@@ -28,10 +28,10 @@ public void requireThatHashCodeAndEqualsAreImplemented() {
     @Test
     public void requireThatInputIsDecoded() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("zcIoHQ"));
+        ctx.setCurrentValue(new StringFieldValue("zcIoHQ"));
         new Base64DecodeExpression().execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof LongFieldValue);
         assertEquals(489210573L, ((LongFieldValue)val).getLong());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeTestCase.java
index 20dfd762057f..2f73c07d3c8e 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeTestCase.java
@@ -28,10 +28,10 @@ public void requireThatHashCodeAndEqualsAreImplemented() {
     @Test
     public void requireThatInputIsEncoded() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new LongFieldValue(489210573L));
+        ctx.setCurrentValue(new LongFieldValue(489210573L));
         new Base64EncodeExpression().execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertEquals("zcIoHQAAAAA=", ((StringFieldValue)val).getString());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java
index 17388f656567..cfaeafa5f6c5 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java
@@ -234,16 +234,16 @@ private static FieldValue evaluate(FieldValue valA, FieldValue valB) {
     private static FieldValue evaluate(DataType typeA, FieldValue valA, DataType typeB, FieldValue valB) {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter(new Field("a", typeA),
                                                                           new Field("b", typeB)));
-        ctx.setOutputValue(null, "a", valA);
-        ctx.setOutputValue(null, "b", valB);
+        ctx.setFieldValue("a", valA, null);
+        ctx.setFieldValue("b", valB, null);
         new CatExpression(new InputExpression("a"), new InputExpression("b")).execute(ctx);
-        return ctx.getValue();
+        return ctx.getCurrentValue();
     }
 
     private static DataType evaluate(DataType typeA, DataType typeB) {
         SimpleTestAdapter adapter = new SimpleTestAdapter(new Field("a", typeA), new Field("b", typeB));
         VerificationContext ctx = new VerificationContext(adapter);
         new CatExpression(new InputExpression("a"), new InputExpression("b")).verify(ctx);
-        return ctx.getValueType();
+        return ctx.getCurrentType();
     }
 }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceTestCase.java
index f36ef96270cf..05f3bfb9b117 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ChoiceTestCase.java
@@ -2,11 +2,9 @@
 package com.yahoo.vespa.indexinglanguage.expressions;
 
 import com.yahoo.document.DataType;
-import com.yahoo.document.Document;
 import com.yahoo.document.Field;
 import com.yahoo.document.datatypes.LongFieldValue;
 import com.yahoo.document.datatypes.StringFieldValue;
-import com.yahoo.language.Linguistics;
 import com.yahoo.language.process.Embedder;
 import com.yahoo.language.simple.SimpleLinguistics;
 import com.yahoo.vespa.indexinglanguage.ExpressionSearcher;
@@ -31,7 +29,7 @@ public void testChoiceExecution() {
             adapter.setValue("foo", new StringFieldValue("foo1"));
             ExecutionContext context = new ExecutionContext(adapter);
             choice.execute(context);
-            assertEquals("foo1", context.getValue().getWrappedValue());
+            assertEquals("foo1", context.getCurrentValue().getWrappedValue());
         }
 
         {   // bar only
@@ -39,7 +37,7 @@ public void testChoiceExecution() {
             adapter.setValue("bar", new StringFieldValue("bar1"));
             ExecutionContext context = new ExecutionContext(adapter);
             choice.execute(context);
-            assertEquals("bar1", context.getValue().getWrappedValue());
+            assertEquals("bar1", context.getCurrentValue().getWrappedValue());
         }
 
         {   // both foo and bar
@@ -49,7 +47,7 @@ public void testChoiceExecution() {
             choice.verify(adapter);
             ExecutionContext context = new ExecutionContext(adapter);
             choice.execute(context);
-            assertEquals("foo1", context.getValue().getWrappedValue());
+            assertEquals("foo1", context.getCurrentValue().getWrappedValue());
         }
     }
 
@@ -63,7 +61,7 @@ public void testChoiceWithConstant() throws ParseException {
             adapter.setValue("timestamp", new LongFieldValue(34));
             ExecutionContext context = new ExecutionContext(adapter);
             choice.execute(context);
-            assertEquals(34L, context.getValue().getWrappedValue());
+            assertEquals(34L, context.getCurrentValue().getWrappedValue());
         }
 
         { // fallback to default
@@ -71,7 +69,7 @@ public void testChoiceWithConstant() throws ParseException {
             choice.verify(adapter);
             ExecutionContext context = new ExecutionContext(adapter);
             choice.execute(context);
-            assertEquals(99999999L, context.getValue().getWrappedValue());
+            assertEquals(99999999L, context.getCurrentValue().getWrappedValue());
         }
     }
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateTestCase.java
index c9c24c0ecf03..cb480a36bf4d 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateTestCase.java
@@ -38,7 +38,7 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatVerificationContextIsCleared() {
         MyVerification ctx = new MyVerification();
-        ctx.execute(new ClearStateExpression());
+        ctx.verify(new ClearStateExpression());
         assertTrue(ctx.cleared);
     }
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/EchoTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/EchoTestCase.java
index 6a7e88be51a0..9bce89b62330 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/EchoTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/EchoTestCase.java
@@ -42,7 +42,7 @@ public void requireThatValueIsEchoed() {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("69"));
+        ctx.setCurrentValue(new StringFieldValue("69"));
         new EchoExpression(new PrintStream(out)).execute(ctx);
 
         assertEquals("69" + System.getProperty("line.separator"), out.toString());
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExactTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExactTestCase.java
index b338c45f7a40..bff8b81d4fd1 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExactTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExactTestCase.java
@@ -29,55 +29,55 @@ public void requireThatHashCodeAndEqualsAreImplemented() {
     @Test
     public void requireThatValueIsNotChanged() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("FOO"));
+        ctx.setCurrentValue(new StringFieldValue("FOO"));
         new ExactExpression().execute(ctx);
 
-        assertEquals("FOO", String.valueOf(ctx.getValue()));
+        assertEquals("FOO", String.valueOf(ctx.getCurrentValue()));
     }
 
     @Test
     public void requireThatValueIsAnnotated() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("FOO"));
+        ctx.setCurrentValue(new StringFieldValue("FOO"));
         new ExactExpression().execute(ctx);
 
-        assertAnnotation(0, 3, new StringFieldValue("foo"), (StringFieldValue)ctx.getValue());
+        assertAnnotation(0, 3, new StringFieldValue("foo"), (StringFieldValue)ctx.getCurrentValue());
     }
 
     @Test
     public void requireThatThereIsNoSegmentation() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("FOO BAR"));
+        ctx.setCurrentValue(new StringFieldValue("FOO BAR"));
         new ExactExpression().execute(ctx);
 
-        assertAnnotation(0, 7, new StringFieldValue("foo bar"), (StringFieldValue)ctx.getValue());
+        assertAnnotation(0, 7, new StringFieldValue("foo bar"), (StringFieldValue)ctx.getCurrentValue());
     }
 
     @Test
     public void requireThatRedundantAnnotationValueIsIgnored() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("foo"));
+        ctx.setCurrentValue(new StringFieldValue("foo"));
         new ExactExpression().execute(ctx);
 
-        assertAnnotation(0, 3, null, (StringFieldValue)ctx.getValue());
+        assertAnnotation(0, 3, null, (StringFieldValue)ctx.getCurrentValue());
     }
 
     @Test
     public void requireThatLongStringsAreNotAnnotated() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("foo"));
+        ctx.setCurrentValue(new StringFieldValue("foo"));
         new ExactExpression(2).execute(ctx);
 
-        assertNull(((StringFieldValue)ctx.getValue()).getSpanTree(SpanTrees.LINGUISTICS));
+        assertNull(((StringFieldValue)ctx.getCurrentValue()).getSpanTree(SpanTrees.LINGUISTICS));
     }
 
     @Test
     public void requireThatEmptyStringsAreNotAnnotated() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue(""));
+        ctx.setCurrentValue(new StringFieldValue(""));
         new ExactExpression().execute(ctx);
 
-        assertNull(((StringFieldValue)ctx.getValue()).getSpanTree(SpanTrees.LINGUISTICS));
+        assertNull(((StringFieldValue)ctx.getCurrentValue()).getSpanTree(SpanTrees.LINGUISTICS));
     }
 
     @Test
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContextTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContextTestCase.java
index 6d14b34bfb84..be048ba67fcc 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContextTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContextTestCase.java
@@ -4,7 +4,6 @@
 import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.document.datatypes.StringFieldValue;
 import com.yahoo.language.Language;
-import com.yahoo.language.Linguistics;
 import com.yahoo.language.simple.SimpleLinguistics;
 import org.junit.Test;
 
@@ -19,8 +18,8 @@ public class ExecutionContextTestCase {
     public void requireThatValueCanBeSet() {
         ExecutionContext ctx = new ExecutionContext();
         FieldValue val = new StringFieldValue("foo");
-        ctx.setValue(val);
-        assertSame(val, ctx.getValue());
+        ctx.setCurrentValue(val);
+        assertSame(val, ctx.getCurrentValue());
     }
 
     @Test
@@ -52,9 +51,9 @@ public void requireThatNullLanguageThrowsException() {
     @Test
     public void requireThatClearRemovesValue() {
         ExecutionContext ctx = new ExecutionContext();
-        ctx.setValue(new StringFieldValue("foo"));
+        ctx.setCurrentValue(new StringFieldValue("foo"));
         ctx.clear();
-        assertNull(ctx.getValue());
+        assertNull(ctx.getCurrentValue());
     }
 
     @Test
@@ -88,9 +87,9 @@ public void requireThatResolveLanguageDefaultsToEnglishWithoutValue() {
     @Test
     public void requireThatLanguageCanBeResolved() {
         ExecutionContext ctx = new ExecutionContext();
-        ctx.setValue(new StringFieldValue("\u3072\u3089\u304c\u306a"));
+        ctx.setCurrentValue(new StringFieldValue("\u3072\u3089\u304c\u306a"));
         assertEquals(Language.JAPANESE, ctx.resolveLanguage(new SimpleLinguistics()));
-        ctx.setValue(new StringFieldValue("\ud55c\uae00\uacfc"));
+        ctx.setCurrentValue(new StringFieldValue("\ud55c\uae00\uacfc"));
         assertEquals(Language.KOREAN, ctx.resolveLanguage(new SimpleLinguistics()));
     }
 
@@ -98,9 +97,9 @@ public void requireThatLanguageCanBeResolved() {
     public void requireThatExplicitLanguagePreventsDetection() {
         ExecutionContext ctx = new ExecutionContext();
         ctx.setLanguage(Language.ARABIC);
-        ctx.setValue(new StringFieldValue("\u3072\u3089\u304c\u306a"));
+        ctx.setCurrentValue(new StringFieldValue("\u3072\u3089\u304c\u306a"));
         assertEquals(Language.ARABIC, ctx.resolveLanguage(new SimpleLinguistics()));
-        ctx.setValue(new StringFieldValue("\ud55c\uae00\uacfc"));
+        ctx.setCurrentValue(new StringFieldValue("\ud55c\uae00\uacfc"));
         assertEquals(Language.ARABIC, ctx.resolveLanguage(new SimpleLinguistics()));
     }
 }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionAssert.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionAssert.java
index 05c4ae33cfce..755e47d64086 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionAssert.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionAssert.java
@@ -18,18 +18,18 @@ public static void assertVerifyCtx(VerificationContext ctx, Expression exp, Data
     }
 
     public static void assertVerify(DataType valueBefore, Expression exp, DataType expectedValueAfter) {
-        assertVerifyCtx(new VerificationContext().setValueType(valueBefore), exp, expectedValueAfter);
+        assertVerifyCtx(new VerificationContext().setCurrentType(valueBefore), exp, expectedValueAfter);
     }
 
     public static void assertVerifyThrows(DataType valueBefore, Expression exp, String expectedException) {
-        assertVerifyCtxThrows(new VerificationContext().setValueType(valueBefore), exp, expectedException);
+        assertVerifyCtxThrows(new VerificationContext().setCurrentType(valueBefore), exp, expectedException);
     }
 
     interface CreateExpression {
         Expression create();
     }
     public static void assertVerifyThrows(DataType valueBefore, CreateExpression createExp, String expectedException) {
-        assertVerifyCtxThrows(new VerificationContext().setValueType(valueBefore), createExp, expectedException);
+        assertVerifyCtxThrows(new VerificationContext().setCurrentType(valueBefore), createExp, expectedException);
     }
 
     public static void assertVerifyCtxThrows(VerificationContext ctx, CreateExpression createExp, String expectedException) {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java
index 4d77721a3f6e..07adc4190af7 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java
@@ -75,7 +75,7 @@ public void requireThatEachTokenIsExecutedSeparately() {
         Array<StringFieldValue> arr = new Array<>(DataType.getArray(DataType.STRING));
         arr.add(new StringFieldValue("6"));
         arr.add(new StringFieldValue("9"));
-        ctx.setValue(arr);
+        ctx.setCurrentValue(arr);
 
         MyCollector exp = new MyCollector();
         new ForEachExpression(exp).execute(ctx);
@@ -103,10 +103,10 @@ public void requireThatArrayCanBeConverted() {
         Array<StringFieldValue> before = new Array<>(DataType.getArray(DataType.STRING));
         before.add(new StringFieldValue("6"));
         before.add(new StringFieldValue("9"));
-        ctx.setValue(before);
+        ctx.setCurrentValue(before);
 
         new ForEachExpression(new ToIntegerExpression()).execute(ctx);
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof Array);
 
         Array after = (Array)val;
@@ -118,11 +118,11 @@ public void requireThatArrayCanBeConverted() {
     @Test
     public void requireThatEmptyArrayCanBeConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new Array<StringFieldValue>(DataType.getArray(DataType.STRING)));
+        ctx.setCurrentValue(new Array<StringFieldValue>(DataType.getArray(DataType.STRING)));
 
         new ForEachExpression(new ToIntegerExpression()).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof Array);
         assertEquals(DataType.INT, ((Array)val).getDataType().getNestedType());
         assertTrue(((Array)val).isEmpty());
@@ -143,12 +143,12 @@ public void requireThatArrayWithNullCanBeConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         Array<StringFieldValue> arr = new Array<>(DataType.getArray(DataType.STRING));
         arr.add(new StringFieldValue("foo"));
-        ctx.setValue(arr);
+        ctx.setCurrentValue(arr);
 
         new ForEachExpression(SimpleExpression.newConversion(DataType.STRING, DataType.INT)
                                               .setExecuteValue(null)).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof Array);
         assertEquals(DataType.INT, ((Array)val).getDataType().getNestedType());
         assertTrue(((Array)val).isEmpty());
@@ -160,10 +160,10 @@ public void requireThatWsetCanBeConverted() {
         WeightedSet<StringFieldValue> before = new WeightedSet<>(DataType.getWeightedSet(DataType.STRING));
         before.put(new StringFieldValue("6"), 9);
         before.put(new StringFieldValue("9"), 6);
-        ctx.setValue(before);
+        ctx.setCurrentValue(before);
 
         new ForEachExpression(new ToIntegerExpression()).execute(ctx);
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof WeightedSet);
 
         WeightedSet after = (WeightedSet)val;
@@ -175,11 +175,11 @@ public void requireThatWsetCanBeConverted() {
     @Test
     public void requireThatEmptyWsetCanBeConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new WeightedSet<StringFieldValue>(DataType.getWeightedSet(DataType.STRING)));
+        ctx.setCurrentValue(new WeightedSet<StringFieldValue>(DataType.getWeightedSet(DataType.STRING)));
 
         new ForEachExpression(new ToIntegerExpression()).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof WeightedSet);
         assertEquals(DataType.INT, ((WeightedSet)val).getDataType().getNestedType());
         assertTrue(((WeightedSet)val).isEmpty());
@@ -193,11 +193,11 @@ public void requireThatStructContentCanBeConverted() {
         struct.setFieldValue("my_str", new StringFieldValue("  foo  "));
 
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(struct);
+        ctx.setCurrentValue(struct);
 
         new ForEachExpression(new TrimExpression()).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof Struct);
         assertEquals(type, val.getDataType());
         assertEquals(new StringFieldValue("foo"), ((Struct)val).getFieldValue("my_str"));
@@ -209,7 +209,7 @@ public void requireThatIncompatibleStructFieldsFailToValidate() {
         type.addField(new Field("my_int", DataType.INT));
 
         VerificationContext ctx = new VerificationContext(new SimpleTestAdapter());
-        ctx.setValueType(type);
+        ctx.setCurrentType(type);
 
         try {
             new ForEachExpression(new ToArrayExpression()).verify(ctx);
@@ -227,7 +227,7 @@ public void requireThatIncompatibleStructFieldsFailToExecute() {
         struct.setFieldValue("my_int", new IntegerFieldValue(69));
 
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(struct);
+        ctx.setCurrentValue(struct);
 
         try {
             new ForEachExpression(new ToArrayExpression()).execute(ctx);
@@ -247,7 +247,7 @@ private static class MyCollector extends Expression {
         }
         @Override
         protected void doExecute(ExecutionContext context) {
-            lst.add(context.getValue());
+            lst.add(context.getCurrentValue());
         }
 
         @Override
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarTestCase.java
index 768f312b27c8..20fdf562ff1c 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarTestCase.java
@@ -51,7 +51,7 @@ public void requireThatSymbolIsRead() {
         ctx.setVariable("in", new IntegerFieldValue(69));
         new GetVarExpression("in").execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof IntegerFieldValue);
         assertEquals(69, ((IntegerFieldValue)val).getInteger());
     }
@@ -59,12 +59,12 @@ public void requireThatSymbolIsRead() {
     @Test
     public void requireThatGetVarCanBeUsedToImplementSum() throws ParseException {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setOutputValue(null, "in", new StringFieldValue("0;1;2;3;4;5;6;7;8;9"));
+        ctx.setFieldValue("in", new StringFieldValue("0;1;2;3;4;5;6;7;8;9"), null);
         ScriptExpression.fromString("{ 0 | set_var tmp; " +
                                     "  input in | split ';' | for_each { to_int + get_var tmp | set_var tmp };" +
                                     "  get_var tmp | attribute out; }").execute(ctx);
 
-        FieldValue val = ctx.getInputValue("out");
+        FieldValue val = ctx.getFieldValue("out");
         assertTrue(val instanceof IntegerFieldValue);
         assertEquals(45, ((IntegerFieldValue)val).getInteger());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeTestCase.java
index eed3185d7d83..9cb8977afd7b 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeTestCase.java
@@ -36,10 +36,10 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireInputIsDecoded() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("1d28c2cd"));
+        ctx.setCurrentValue(new StringFieldValue("1d28c2cd"));
         new HexDecodeExpression().execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof LongFieldValue);
         assertEquals(489210573L, ((LongFieldValue)val).getLong());
     }
@@ -47,10 +47,10 @@ public void requireInputIsDecoded() {
     @Test
     public void requireThatLargeInputIsDecoded() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("ff7a3c87fd74abff"));
+        ctx.setCurrentValue(new StringFieldValue("ff7a3c87fd74abff"));
         new HexDecodeExpression().execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof LongFieldValue);
         assertEquals(-37651092108694529L, ((LongFieldValue)val).getLong());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeTestCase.java
index fb9e4c9b3793..670172319101 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeTestCase.java
@@ -36,10 +36,10 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatInputIsEncoded() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new LongFieldValue(489210573L));
+        ctx.setCurrentValue(new LongFieldValue(489210573L));
         new HexEncodeExpression().execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertEquals("1d28c2cd", ((StringFieldValue)val).getString());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameTestCase.java
index d331adffd55f..82d8d6e5393a 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameTestCase.java
@@ -38,7 +38,7 @@ public void requireThatHostnameIsSet() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         new HostNameExpression().execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertEquals(HostNameExpression.normalizeHostName(getDefaults().vespaHostname()),
                      ((StringFieldValue)val).getString());
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java
index c45b16beadb7..932652e65717 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java
@@ -146,7 +146,7 @@ public void requireThatElseExpIsOptional() {
                                               Comparator.GT,
                                               new ConstantExpression(new IntegerFieldValue(9)),
                                               new ConstantExpression(new StringFieldValue("69")));
-        FieldValue val = ctx.setValue(new IntegerFieldValue(96)).execute(exp).getValue();
+        FieldValue val = ctx.setCurrentValue(new IntegerFieldValue(96)).execute(exp).getCurrentValue();
         assertTrue(val instanceof IntegerFieldValue);
         assertEquals(96, ((IntegerFieldValue)val).getInteger());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/InputTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/InputTestCase.java
index c3739be747f6..4c2fd545b6c6 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/InputTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/InputTestCase.java
@@ -47,10 +47,10 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatFieldIsRead() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter(new Field("in", DataType.STRING)));
-        ctx.setOutputValue(null, "in", new StringFieldValue("69"));
+        ctx.setFieldValue("in", new StringFieldValue("69"), null);
         new InputExpression("in").execute(ctx);
 
-        assertEquals(new StringFieldValue("69"), ctx.getValue());
+        assertEquals(new StringFieldValue("69"), ctx.getCurrentValue());
     }
 
     @Test
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/JoinTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/JoinTestCase.java
index fd28a3aebef8..7c997ecebf26 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/JoinTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/JoinTestCase.java
@@ -46,10 +46,10 @@ public void requireThatValueIsJoined() {
         Array<StringFieldValue> arr = new Array<>(DataType.getArray(DataType.STRING));
         arr.add(new StringFieldValue("6"));
         arr.add(new StringFieldValue("9"));
-        ctx.setValue(arr);
+        ctx.setCurrentValue(arr);
 
         new JoinExpression(";").execute(ctx);
-        assertEquals(new StringFieldValue("6;9"), ctx.getValue());
+        assertEquals(new StringFieldValue("6;9"), ctx.getCurrentValue());
     }
 
     @Test
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpressionTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpressionTestCase.java
index 514f79d88f22..ab45136f4d71 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpressionTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/LiteralBoolExpressionTestCase.java
@@ -46,7 +46,7 @@ public void testToString() {
     public void requireThatTrueBecomesTrue() {
         ExecutionContext context = new ExecutionContext(new SimpleTestAdapter());
         context.execute(new LiteralBoolExpression(true));
-        FieldValue value = context.getValue();
+        FieldValue value = context.getCurrentValue();
         assertTrue(value instanceof BoolFieldValue);
         assertTrue(((BoolFieldValue)value).getBoolean());
     }
@@ -55,7 +55,7 @@ public void requireThatTrueBecomesTrue() {
     public void requireThatFalseBecomesFalse() {
         ExecutionContext context = new ExecutionContext(new SimpleTestAdapter());
         context.execute(new LiteralBoolExpression(false));
-        FieldValue value = context.getValue();
+        FieldValue value = context.getCurrentValue();
         assertTrue(value instanceof BoolFieldValue);
         assertFalse(((BoolFieldValue)value).getBoolean());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseTestCase.java
index 89f782ed5258..49085ec7da18 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseTestCase.java
@@ -35,10 +35,10 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatStringIsLowerCased() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("FOO"));
+        ctx.setCurrentValue(new StringFieldValue("FOO"));
         new LowerCaseExpression().execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertEquals("foo", ((StringFieldValue)val).getString());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolverTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolverTestCase.java
index ebb39257a84f..88c8b1f8bd36 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolverTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolverTestCase.java
@@ -97,7 +97,7 @@ private static Expression newInteger(int val) {
     }
 
     private static int evaluate(Expression exp) {
-        FieldValue val = new ExecutionContext(new SimpleTestAdapter()).execute(exp).getValue();
+        FieldValue val = new ExecutionContext(new SimpleTestAdapter()).execute(exp).getCurrentValue();
         assertTrue(val instanceof IntegerFieldValue);
         return ((IntegerFieldValue)val).getInteger();
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NGramTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NGramTestCase.java
index b4e266ab3ebb..a3ce6a204b24 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NGramTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NGramTestCase.java
@@ -53,10 +53,10 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void testNGrams() {
         ExecutionContext context = new ExecutionContext(new SimpleTestAdapter());
-        context.setValue(new StringFieldValue("en gul Bille sang... "));
+        context.setCurrentValue(new StringFieldValue("en gul Bille sang... "));
         new NGramExpression(new SimpleLinguistics(), 3).execute(context);
 
-        StringFieldValue value = (StringFieldValue)context.getValue();
+        StringFieldValue value = (StringFieldValue)context.getCurrentValue();
         assertEquals("Grams are pure annotations - field value is unchanged",
                      "en gul Bille sang... ", value.getString());
         SpanTree gramTree = value.getSpanTree(SpanTrees.LINGUISTICS);
@@ -80,15 +80,15 @@ public void testNGrams() {
     @Test
     public void requireThatExecuteCanBeCalledMultipleTimes() {
         ExecutionContext context = new ExecutionContext(new SimpleTestAdapter());
-        context.setValue(new StringFieldValue("some random text string"));
+        context.setCurrentValue(new StringFieldValue("some random text string"));
         NGramExpression expression = new NGramExpression(new SimpleLinguistics(), 3);
 
         expression.execute(context);
-        SpanTree firstTree = ((StringFieldValue)context.getValue()).getSpanTree(SpanTrees.LINGUISTICS);
+        SpanTree firstTree = ((StringFieldValue)context.getCurrentValue()).getSpanTree(SpanTrees.LINGUISTICS);
         assertNotNull(firstTree);
 
         expression.execute(context);
-        SpanTree secondTree = ((StringFieldValue)context.getValue()).getSpanTree(SpanTrees.LINGUISTICS);
+        SpanTree secondTree = ((StringFieldValue)context.getCurrentValue()).getSpanTree(SpanTrees.LINGUISTICS);
         // The span tree instance should be the same.
         assertEquals(firstTree, secondTree);
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeTestCase.java
index 441b9f57b39c..2c8e2c029e2a 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeTestCase.java
@@ -51,10 +51,10 @@ public void requireThatExpressionCanBeVerified() {
     public void requireThatInputIsNormalized() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         ctx.setLanguage(Language.ENGLISH);
-        ctx.setValue(new StringFieldValue("b\u00e9yonc\u00e8"));
+        ctx.setCurrentValue(new StringFieldValue("b\u00e9yonc\u00e8"));
         new NormalizeExpression(new SimpleLinguistics()).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertEquals("beyonce", ((StringFieldValue)val).getString());
     }
@@ -93,11 +93,11 @@ public Transformer getTransformer() {
     public void requireThatBadNormalizeRetries() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         ctx.setLanguage(Language.ENGLISH);
-        ctx.setValue(new StringFieldValue("bad norm"));
+        ctx.setCurrentValue(new StringFieldValue("bad norm"));
         var linguistics = new MyMockLinguistics();
         assertTrue(getFirst(linguistics.getTransformer()));
         new NormalizeExpression(linguistics).execute(ctx);
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertEquals("bad/norm", ((StringFieldValue)val).getString());
         assertFalse(getFirst(linguistics.getTransformer()));
@@ -108,11 +108,11 @@ public void requireThatEmptyIsNop() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         ctx.setLanguage(Language.ENGLISH);
         var orig = new StringFieldValue("");
-        ctx.setValue(orig);
+        ctx.setCurrentValue(orig);
         var linguistics = new MyMockLinguistics();
         assertTrue(getFirst(linguistics.getTransformer()));
         new NormalizeExpression(linguistics).execute(ctx);
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val == orig);
         assertTrue(getFirst(linguistics.getTransformer()));
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NowTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NowTestCase.java
index 45ac36d9100a..4e9d51744b14 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NowTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/NowTestCase.java
@@ -45,7 +45,7 @@ public void requireThatCurrentTimeIsSet() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         new NowExpression(new MyTimer()).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof LongFieldValue);
         assertEquals(69L, ((LongFieldValue)val).getLong());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateTestCase.java
index 73a906ad3385..750e3114b624 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateTestCase.java
@@ -26,7 +26,7 @@ public void requireThatOptimizerIsCalledWithCloneOfInput() {
         final Predicate predicateB = Mockito.mock(Predicate.class);
         final PredicateFieldValue input = new PredicateFieldValue(predicateA);
         ExecutionContext ctx = new ExecutionContext()
-                .setValue(input)
+                .setCurrentValue(input)
                 .setVariable("arity", new IntegerFieldValue(10));
         FieldValue output = new OptimizePredicateExpression(
                 (predicate, options) -> {
@@ -44,7 +44,7 @@ public void requireThatPredicateOptionsAreSet() {
         final Predicate predicate = Mockito.mock(Predicate.class);
         final PredicateFieldValue input = new PredicateFieldValue(predicate);
         ExecutionContext ctx = new ExecutionContext()
-                .setValue(input)
+                .setCurrentValue(input)
                 .setVariable("arity", new IntegerFieldValue(10));
         new OptimizePredicateExpression((predicate1, options) -> {
             assertEquals(10, options.getArity());
@@ -80,7 +80,7 @@ public void requireThatExpressionCanBeVerified() {
         assertVerifyThrows(DataType.INT, exp, "Expected predicate input, got int");
         assertVerifyThrows(DataType.PREDICATE, exp, "Variable 'arity' must be set");
 
-        VerificationContext context = new VerificationContext().setValueType(DataType.PREDICATE);
+        VerificationContext context = new VerificationContext().setCurrentType(DataType.PREDICATE);
         context.setVariable("arity", DataType.STRING);
         assertVerifyCtxThrows(context, exp, "Variable 'arity' must have type int");
         context.setVariable("arity", DataType.INT);
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java
index 2f41ffcfc6fc..23cbc0ab9760 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java
@@ -16,10 +16,10 @@ class OutputAssert {
 
     public static void assertExecute(OutputExpression exp) {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter(new Field(exp.getFieldName(), DataType.STRING)));
-        ctx.setValue(new StringFieldValue("69"));
+        ctx.setCurrentValue(new StringFieldValue("69"));
         ctx.execute(exp);
 
-        FieldValue out = ctx.getInputValue(exp.getFieldName());
+        FieldValue out = ctx.getFieldValue(exp.getFieldName());
         assertTrue(out instanceof StringFieldValue);
         assertEquals("69", ((StringFieldValue)out).getString());
     }
@@ -32,14 +32,14 @@ public static void assertVerify(OutputExpression exp) {
     }
 
     public static void assertVerify(FieldTypeAdapter adapter, DataType value, Expression exp) {
-        assertEquals(value, new VerificationContext(adapter).setValueType(value).execute(exp).getValueType());
+        assertEquals(value, new VerificationContext(adapter).setCurrentType(value).verify(exp).getCurrentType());
     }
 
     public static void assertVerifyThrows(FieldTypeAdapter adapter, DataType value, Expression exp,
                                           String expectedException)
     {
         try {
-            new VerificationContext(adapter).setValueType(value).execute(exp);
+            new VerificationContext(adapter).setCurrentType(value).verify(exp);
             fail();
         } catch (VerificationException e) {
             assertEquals(expectedException, e.getMessage());
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisTestCase.java
index 9742dcadb3a7..54aaba282742 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisTestCase.java
@@ -44,10 +44,10 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatNestedExpressionIsRun() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter(new Field("in", DataType.STRING)));
-        ctx.setOutputValue(null, "in", new StringFieldValue("69"));
+        ctx.setFieldValue("in", new StringFieldValue("69"), null);
         new ParenthesisExpression(new InputExpression("in")).execute(ctx);
 
-        assertTrue(ctx.getValue() instanceof StringFieldValue);
-        assertEquals("69", ((StringFieldValue)ctx.getValue()).getString());
+        assertTrue(ctx.getCurrentValue() instanceof StringFieldValue);
+        assertEquals("69", ((StringFieldValue)ctx.getCurrentValue()).getString());
     }
 }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/RandomTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/RandomTestCase.java
index 20c2521d94e7..ada30f7d5ae7 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/RandomTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/RandomTestCase.java
@@ -45,7 +45,7 @@ public void requireThatRandomValueIsSet() {
             ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
             new RandomExpression(69).execute(ctx);
 
-            FieldValue val = ctx.getValue();
+            FieldValue val = ctx.getCurrentValue();
             assertTrue(val instanceof IntegerFieldValue);
             assertTrue(((IntegerFieldValue)val).getInteger() < 69);
         }
@@ -54,10 +54,10 @@ public void requireThatRandomValueIsSet() {
     @Test
     public void requireThatInputValueIsParsedAsMaxIfNoneIsConfigured() {
         for (int i = 0; i < 666; ++i) {
-            ExecutionContext ctx = new ExecutionContext().setValue(new IntegerFieldValue(69));
+            ExecutionContext ctx = new ExecutionContext().setCurrentValue(new IntegerFieldValue(69));
             new RandomExpression().execute(ctx);
 
-            FieldValue val = ctx.getValue();
+            FieldValue val = ctx.getCurrentValue();
             assertTrue(val instanceof IntegerFieldValue);
             assertTrue(((IntegerFieldValue)val).getInteger() < 69);
         }
@@ -72,7 +72,7 @@ public void requireThatIllegalInputThrowsNumberFormatException() {
 
         }
         try {
-            new RandomExpression().execute(new ExecutionContext().setValue(new StringFieldValue("foo")));
+            new RandomExpression().execute(new ExecutionContext().setCurrentValue(new StringFieldValue("foo")));
             fail();
         } catch (NumberFormatException e) {
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptTestCase.java
index c6fb7c1db8c4..70526b5f06d8 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptTestCase.java
@@ -1,10 +1,13 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.indexinglanguage.expressions;
 
+import com.yahoo.document.ArrayDataType;
 import com.yahoo.document.DataType;
 import com.yahoo.document.Field;
+import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.document.datatypes.IntegerFieldValue;
 import com.yahoo.document.datatypes.StringFieldValue;
+import com.yahoo.language.simple.SimpleLinguistics;
 import com.yahoo.vespa.indexinglanguage.SimpleTestAdapter;
 import org.junit.Test;
 
@@ -143,6 +146,44 @@ public void requireThatVariablesReplaceOthersOutsideScript() {
         assertEquals(new IntegerFieldValue(9), adapter.getInputValue("out"));
     }
 
+    @Test
+    // input myString | lowercase | summary | index | split ";" | for_each {
+    public void testSplitAndForEach() {
+        var adapter = new SimpleTestAdapter();
+        adapter.createField(new Field("myString", DataType.STRING));
+        adapter.createField(new Field("myArray", new ArrayDataType(DataType.STRING)));
+        adapter.setValue("myString", new StringFieldValue("my;test;values"));
+        var statement =
+                newStatement(new InputExpression("myString"),
+                             new LowerCaseExpression(),
+                             new SplitExpression(";"),
+                             new ForEachExpression(new StatementExpression(new SubstringExpression(0, 1))),
+                             new AttributeExpression("myArray"));
+        statement.verify(adapter);
+        statement.execute(adapter);
+        assertEquals("[m, t, v]", adapter.values.get("myArray").toString());
+    }
+
+    @Test
+    //  input myString | lowercase | split ";" |
+    //            for_each { trim | normalize } |
+    //            to_string | index;
+    public void testForEachToString() {
+        var adapter = new SimpleTestAdapter();
+        adapter.createField(new Field("myString", DataType.STRING));
+        adapter.setValue("myString", new StringFieldValue("my;tEsT;Values"));
+        var statement =
+                newStatement(new InputExpression("myString"),
+                             new LowerCaseExpression(),
+                             new SplitExpression(";"),
+                             new ForEachExpression(new StatementExpression(new TrimExpression(), new NormalizeExpression(new SimpleLinguistics()))),
+                             new ToStringExpression(),
+                             new IndexExpression("myString"));
+        statement.verify(adapter);
+        statement.execute(adapter);
+        assertEquals("[my, test, values]", adapter.values.get("myString").toString());
+    }
+
     private static ScriptExpression newScript(StatementExpression... args) {
         return new ScriptExpression(args);
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java
index 23392c001102..963a84b6990b 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputTestCase.java
@@ -73,7 +73,7 @@ public void requireThatSelectedExpressionIsRun() {
     }
 
     private static void assertVerify(FieldTypeAdapter adapter, DataType value, Expression exp) {
-        assertEquals(value, exp.verify(new VerificationContext(adapter).setValueType(value)));
+        assertEquals(value, exp.verify(new VerificationContext(adapter).setCurrentType(value)));
     }
 
     private static void assertVerifyThrows(FieldTypeAdapter adapter, Expression exp, String expectedException) {
@@ -98,7 +98,7 @@ private static void assertSelect(List<String> inputField, List<String> available
         ExecutionContext ctx = new ExecutionContext(adapter);
         for (String fieldName : availableFields) {
             adapter.createField(new Field(fieldName, DataType.STRING));
-            ctx.setOutputValue(null, fieldName, new StringFieldValue(fieldName));
+            ctx.setFieldValue(fieldName, new StringFieldValue(fieldName), null);
         }
         List<Pair<String, Expression>> cases = new LinkedList<>();
         for (String fieldName : inputField) {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageTestCase.java
index 2efa67c54a44..fae3b0c25d4e 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageTestCase.java
@@ -36,7 +36,7 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void testsettingEnglish() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("en"));
+        ctx.setCurrentValue(new StringFieldValue("en"));
         new SetLanguageExpression().execute(ctx);
         assertEquals(Language.ENGLISH, ctx.getLanguage());
     }
@@ -44,7 +44,7 @@ public void testsettingEnglish() {
     @Test
     public void testSettingUnknown() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("unknown"));
+        ctx.setCurrentValue(new StringFieldValue("unknown"));
         new SetLanguageExpression().execute(ctx);
         assertEquals(Language.UNKNOWN, ctx.getLanguage());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueTestCase.java
index b7a9e795888f..7ef79efa62cf 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueTestCase.java
@@ -55,7 +55,7 @@ public void requireThatNullValueThrowsException() {
     public void requireThatValueIsSet() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         new ConstantExpression(new StringFieldValue("69")).execute(ctx);
-        assertEquals(new StringFieldValue("69"), ctx.getValue());
+        assertEquals(new StringFieldValue("69"), ctx.getCurrentValue());
     }
 
     @Test
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java
index 28c9ba65dad3..4364865ba24e 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java
@@ -39,7 +39,7 @@ public void requireThatExpressionCanBeVerified() {
         assertVerifyThrows(null, exp, "Expected any input, but no input is specified");
 
         try {
-            new VerificationContext().setVariable("foo", DataType.INT).setValueType(DataType.STRING).execute(exp);
+            new VerificationContext().setVariable("foo", DataType.INT).setCurrentType(DataType.STRING).verify(exp);
             fail();
         } catch (VerificationException e) {
             assertEquals("Attempting to assign conflicting types to variable 'foo', int vs string", e.getMessage());
@@ -49,7 +49,7 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatSymbolIsWritten() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new IntegerFieldValue(69));
+        ctx.setCurrentValue(new IntegerFieldValue(69));
         new SetVarExpression("out").execute(ctx);
 
         FieldValue val = ctx.getVariable("out");
@@ -60,11 +60,11 @@ public void requireThatSymbolIsWritten() {
     @Test
     public void requireThatVariableTypeCanNotChange() {
         VerificationContext ctx = new VerificationContext(new SimpleTestAdapter());
-        ctx.setValueType(DataType.INT);
+        ctx.setCurrentType(DataType.INT);
         new SetVarExpression("out").verify(ctx);
 
         try {
-            ctx.setValueType(DataType.STRING);
+            ctx.setCurrentType(DataType.STRING);
             new SetVarExpression("out").verify(ctx);
             fail();
         } catch (VerificationException e) {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java
index db9aa1898f53..e505b4e51931 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java
@@ -42,14 +42,14 @@ public SimpleExpression setCreatedOutput(DataType createdOutput) {
     @Override
     protected void doExecute(ExecutionContext context) {
         if (hasExecuteValue) {
-            context.setValue(executeValue);
+            context.setCurrentValue(executeValue);
         }
     }
 
     @Override
     protected void doVerify(VerificationContext context) {
         if (hasVerifyValue) {
-            context.setValueType(verifyValue);
+            context.setCurrentType(verifyValue);
         }
     }
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SplitTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SplitTestCase.java
index 76bafec93890..e7df02f9be25 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SplitTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SplitTestCase.java
@@ -44,10 +44,10 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsSplit() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("6;9"));
+        ctx.setCurrentValue(new StringFieldValue("6;9"));
         new SplitExpression(";").execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val.getDataType().equals(DataType.getArray(DataType.STRING)));
         assertTrue(val instanceof Array);
 
@@ -61,16 +61,16 @@ public void requireThatNullInputProducesNullOutput() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         new SplitExpression(";").execute(ctx);
 
-        assertNull(ctx.getValue());
+        assertNull(ctx.getCurrentValue());
     }
 
     @Test
     public void requireThatEmptyInputProducesEmptyArray() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue(""));
+        ctx.setCurrentValue(new StringFieldValue(""));
         new SplitExpression(";").execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val.getDataType().equals(DataType.getArray(DataType.STRING)));
         assertTrue(val instanceof Array);
         assertEquals(0, ((Array)val).size());
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java
index 3612e3bd9fca..f134191c4a3d 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java
@@ -108,7 +108,7 @@ public void requireThatStatementIsExecuted() {
         StatementExpression statement = newStatement(new ConstantExpression(new IntegerFieldValue(69)));
         newStatement(statement).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof IntegerFieldValue);
         assertEquals(69, ((IntegerFieldValue)val).getInteger());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringTestCase.java
index aeb1947e97ca..f05e3117ba70 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringTestCase.java
@@ -67,10 +67,10 @@ private static void assertIndexOutOfBounds(int from, int to) {
     @Test
     public void requireThatStringIsSliced() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("666999"));
+        ctx.setCurrentValue(new StringFieldValue("666999"));
         new SubstringExpression(2, 4).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertEquals("69", ((StringFieldValue)val).getString());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchTestCase.java
index 376677b6f57a..dddc8762b553 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchTestCase.java
@@ -126,6 +126,6 @@ public void requireThatDefaultExpressionIsExecuted() {
     }
 
     private static void assertEvaluate(FieldValue input, Expression exp, FieldValue expectedOutVar) {
-        assertEquals(expectedOutVar, new ExecutionContext().setValue(input).execute(exp).getVariable("out"));
+        assertEquals(expectedOutVar, new ExecutionContext().setCurrentValue(input).execute(exp).getVariable("out"));
     }
 }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ThisTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ThisTestCase.java
index a04dfc82a595..21c399b8c0cf 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ThisTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ThisTestCase.java
@@ -35,9 +35,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsPreserved() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("69"));
+        ctx.setCurrentValue(new StringFieldValue("69"));
         new ThisExpression().execute(ctx);
 
-        assertEquals(new StringFieldValue("69"), ctx.getValue());
+        assertEquals(new StringFieldValue("69"), ctx.getCurrentValue());
     }
 }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayTestCase.java
index 6f024e3547d5..d1ac4152ee36 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayTestCase.java
@@ -39,9 +39,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("69")).execute(new ToArrayExpression());
+        ctx.setCurrentValue(new StringFieldValue("69")).execute(new ToArrayExpression());
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertEquals(Array.class, val.getClass());
 
         Array arr = (Array)val;
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolTestCase.java
index 1452dc447b2a..6ac0a27c11be 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToBoolTestCase.java
@@ -5,7 +5,6 @@
 import com.yahoo.document.datatypes.BoolFieldValue;
 import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.document.datatypes.IntegerFieldValue;
-import com.yahoo.document.datatypes.LongFieldValue;
 import com.yahoo.document.datatypes.StringFieldValue;
 import com.yahoo.vespa.indexinglanguage.SimpleTestAdapter;
 import org.junit.Test;
@@ -40,8 +39,8 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatNonEmptyStringBecomesTrue() {
         ExecutionContext context = new ExecutionContext(new SimpleTestAdapter());
-        context.setValue(new StringFieldValue("false")).execute(new ToBoolExpression());
-        FieldValue value = context.getValue();
+        context.setCurrentValue(new StringFieldValue("false")).execute(new ToBoolExpression());
+        FieldValue value = context.getCurrentValue();
         assertTrue(value instanceof BoolFieldValue);
         assertTrue(((BoolFieldValue)value).getBoolean());
     }
@@ -49,8 +48,8 @@ public void requireThatNonEmptyStringBecomesTrue() {
     @Test
     public void requireThatEmptyStringBecomesFalse() {
         ExecutionContext context = new ExecutionContext(new SimpleTestAdapter());
-        context.setValue(new StringFieldValue("")).execute(new ToBoolExpression());
-        FieldValue value = context.getValue();
+        context.setCurrentValue(new StringFieldValue("")).execute(new ToBoolExpression());
+        FieldValue value = context.getCurrentValue();
         assertTrue(value instanceof BoolFieldValue);
         assertFalse(((BoolFieldValue)value).getBoolean());
     }
@@ -58,8 +57,8 @@ public void requireThatEmptyStringBecomesFalse() {
     @Test
     public void requireThatNonZeroBecomesTrue() {
         ExecutionContext context = new ExecutionContext(new SimpleTestAdapter());
-        context.setValue(new IntegerFieldValue(37)).execute(new ToBoolExpression());
-        FieldValue value = context.getValue();
+        context.setCurrentValue(new IntegerFieldValue(37)).execute(new ToBoolExpression());
+        FieldValue value = context.getCurrentValue();
         assertTrue(value instanceof BoolFieldValue);
         assertTrue(((BoolFieldValue)value).getBoolean());
     }
@@ -67,8 +66,8 @@ public void requireThatNonZeroBecomesTrue() {
     @Test
     public void requireThatZeroBecomesFalse() {
         ExecutionContext context = new ExecutionContext(new SimpleTestAdapter());
-        context.setValue(new IntegerFieldValue(0)).execute(new ToBoolExpression());
-        FieldValue value = context.getValue();
+        context.setCurrentValue(new IntegerFieldValue(0)).execute(new ToBoolExpression());
+        FieldValue value = context.getCurrentValue();
         assertTrue(value instanceof BoolFieldValue);
         assertFalse(((BoolFieldValue)value).getBoolean());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteTestCase.java
index f536c37d12e3..43f53c45e09c 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteTestCase.java
@@ -36,9 +36,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("69")).execute(new ToByteExpression());
+        ctx.setCurrentValue(new StringFieldValue("69")).execute(new ToByteExpression());
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof ByteFieldValue);
         assertEquals(69, ((ByteFieldValue)val).getByte());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleTestCase.java
index 3a3576f8524a..60d3f83c77a1 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleTestCase.java
@@ -36,9 +36,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("6.9")).execute(new ToDoubleExpression());
+        ctx.setCurrentValue(new StringFieldValue("6.9")).execute(new ToDoubleExpression());
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof DoubleFieldValue);
         assertEquals(6.9, ((DoubleFieldValue)val).getDouble(), 1e-6);
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToEpochSecondExpressionTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToEpochSecondExpressionTestCase.java
index f07f9304ba95..0a98ef845996 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToEpochSecondExpressionTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToEpochSecondExpressionTestCase.java
@@ -34,8 +34,8 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsConvertedWithMs() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("2023-12-24T17:00:43.000Z")).execute(new ToEpochSecondExpression());
-        FieldValue val = ctx.getValue();
+        ctx.setCurrentValue(new StringFieldValue("2023-12-24T17:00:43.000Z")).execute(new ToEpochSecondExpression());
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof LongFieldValue);
         assertEquals(1703437243L, ((LongFieldValue)val).getLong());
     }
@@ -43,8 +43,8 @@ public void requireThatValueIsConvertedWithMs() {
     @Test
     public void requireThatValueIsConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("2023-12-24T17:00:43Z")).execute(new ToEpochSecondExpression());
-        FieldValue val = ctx.getValue();
+        ctx.setCurrentValue(new StringFieldValue("2023-12-24T17:00:43Z")).execute(new ToEpochSecondExpression());
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof LongFieldValue);
         assertEquals(1703437243L, ((LongFieldValue)val).getLong());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatTestCase.java
index bba48158e928..32677aea11f5 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatTestCase.java
@@ -36,9 +36,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("6.9f")).execute(new ToFloatExpression());
+        ctx.setCurrentValue(new StringFieldValue("6.9f")).execute(new ToFloatExpression());
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof FloatFieldValue);
         assertEquals(6.9f, ((FloatFieldValue)val).getFloat(), 1e-6);
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerTestCase.java
index d7f3f9093630..6812848e0100 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerTestCase.java
@@ -36,9 +36,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("69")).execute(new ToIntegerExpression());
+        ctx.setCurrentValue(new StringFieldValue("69")).execute(new ToIntegerExpression());
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof IntegerFieldValue);
         assertEquals(69, ((IntegerFieldValue)val).getInteger());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongTestCase.java
index 03de90e70dc0..d88d1c6691d7 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongTestCase.java
@@ -36,9 +36,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("69")).execute(new ToLongExpression());
+        ctx.setCurrentValue(new StringFieldValue("69")).execute(new ToLongExpression());
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof LongFieldValue);
         assertEquals(69L, ((LongFieldValue)val).getLong());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionTestCase.java
index 03cb6aa37c49..bd7fe2fe78bc 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionTestCase.java
@@ -38,9 +38,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatPositionIsParsed() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("6;9")).execute(new ToPositionExpression());
+        ctx.setCurrentValue(new StringFieldValue("6;9")).execute(new ToPositionExpression());
 
-        FieldValue out = ctx.getValue();
+        FieldValue out = ctx.getCurrentValue();
         assertTrue(out instanceof StructuredFieldValue);
         assertEquals(PositionDataType.INSTANCE, out.getDataType());
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringTestCase.java
index 5e410d079f67..70ef2302e099 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringTestCase.java
@@ -36,9 +36,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsConverted() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new IntegerFieldValue(69)).execute(new ToStringExpression());
+        ctx.setCurrentValue(new IntegerFieldValue(69)).execute(new ToStringExpression());
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertEquals("69", ((StringFieldValue)val).getString());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetTestCase.java
index 7df0667cc2db..0c86fc462209 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetTestCase.java
@@ -65,9 +65,9 @@ private static void assertVerify(boolean createIfNonExistent, boolean removeIfZe
 
     private static void assertConvert(boolean createIfNonExistent, boolean removeIfZero) {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("69")).execute(new ToWsetExpression(createIfNonExistent, removeIfZero));
+        ctx.setCurrentValue(new StringFieldValue("69")).execute(new ToWsetExpression(createIfNonExistent, removeIfZero));
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertEquals(WeightedSet.class, val.getClass());
 
         WeightedSet wset = (WeightedSet)val;
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeTestCase.java
index 7ed3ab410a32..9c0b17dd1220 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeTestCase.java
@@ -55,10 +55,10 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatValueIsAnnotated() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("foo"));
+        ctx.setCurrentValue(new StringFieldValue("foo"));
         new TokenizeExpression(new SimpleLinguistics(), new AnnotatorConfig()).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertNotNull(((StringFieldValue)val).getSpanTree(SpanTrees.LINGUISTICS));
     }
@@ -66,10 +66,10 @@ public void requireThatValueIsAnnotated() {
     @Test
     public void requireThatLongWordIsDropped() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("foo"));
+        ctx.setCurrentValue(new StringFieldValue("foo"));
         new TokenizeExpression(new SimpleLinguistics(), new AnnotatorConfig().setMaxTokenLength(2)).execute(ctx);
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertNull(((StringFieldValue)val).getSpanTree(SpanTrees.LINGUISTICS));
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/TrimTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/TrimTestCase.java
index 8584bae87084..c2f9d4b126f4 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/TrimTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/TrimTestCase.java
@@ -35,9 +35,9 @@ public void requireThatExpressionCanBeVerified() {
     @Test
     public void requireThatStringIsTrimmed() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
-        ctx.setValue(new StringFieldValue("  69  ")).execute(new TrimExpression());
+        ctx.setCurrentValue(new StringFieldValue("  69  ")).execute(new TrimExpression());
 
-        FieldValue val = ctx.getValue();
+        FieldValue val = ctx.getCurrentValue();
         assertTrue(val instanceof StringFieldValue);
         assertEquals("69", ((StringFieldValue)val).getString());
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContextTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContextTestCase.java
index 98d74dc2a6a4..a24ba1343bc0 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContextTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationContextTestCase.java
@@ -16,8 +16,8 @@ public class VerificationContextTestCase {
     public void requireThatValueCanBeSet() {
         VerificationContext ctx = new VerificationContext();
         DataType val = DataType.STRING;
-        ctx.setValueType(val);
-        assertSame(val, ctx.getValueType());
+        ctx.setCurrentType(val);
+        assertSame(val, ctx.getCurrentType());
     }
 
     @Test
@@ -31,9 +31,9 @@ public void requireThatVariablesCanBeSet() {
     @Test
     public void requireThatClearRemovesValue() {
         VerificationContext ctx = new VerificationContext();
-        ctx.setValueType(DataType.STRING);
+        ctx.setCurrentType(DataType.STRING);
         ctx.clear();
-        assertNull(ctx.getValueType());
+        assertNull(ctx.getCurrentType());
     }
 
     @Test
diff --git a/integration/schema-language-server/clients/intellij/build.gradle.kts b/integration/schema-language-server/clients/intellij/build.gradle.kts
index a1b24a891bff..2bc087ab8c42 100644
--- a/integration/schema-language-server/clients/intellij/build.gradle.kts
+++ b/integration/schema-language-server/clients/intellij/build.gradle.kts
@@ -82,6 +82,7 @@ tasks {
 
   patchPluginXml {
     sinceBuild.set("232")
+    untilBuild.set(provider { null })
   }
 
   signPlugin {
diff --git a/integration/schema-language-server/language-server/src/main/ccc/indexinglanguage/IndexingParser.ccc b/integration/schema-language-server/language-server/src/main/ccc/indexinglanguage/IndexingParser.ccc
index a398b9d9199f..9237ff5cd143 100644
--- a/integration/schema-language-server/language-server/src/main/ccc/indexinglanguage/IndexingParser.ccc
+++ b/integration/schema-language-server/language-server/src/main/ccc/indexinglanguage/IndexingParser.ccc
@@ -205,6 +205,7 @@ TOKEN :
     <NORMALIZE: "normalize"> |
     <NOW: "now"> |
     <OPTIMIZE_PREDICATE: "optimize_predicate"> |
+    <PACK_BITS: "pack_bits"> |
     <PASSTHROUGH: "passthrough"> |
     <RANDOM: "random"> |
     <REMOVE_IF_ZERO: "remove_if_zero"> |
@@ -355,6 +356,7 @@ Expression value() :
       val = normalizeExp()          |
       val = nowExp()                |
       val = optimizePredicateExp()  |
+      val = packBitsExp()           |
       val = passthroughExp()        |
       val = randomExp()             |
       val = script()                |
@@ -612,6 +614,12 @@ Expression optimizePredicateExp() : { }
     { return new OptimizePredicateExpression(); }
 ;
 
+Expression packBitsExp() : { }
+
+    ( <PACK_BITS> )
+    { return new PackBitsExpression(); }
+;
+
 Expression passthroughExp() :
 {
     String val = defaultFieldName;
diff --git a/integration/schema-language-server/language-server/src/main/ccc/rankingexpression/RankingExpressionParser.ccc b/integration/schema-language-server/language-server/src/main/ccc/rankingexpression/RankingExpressionParser.ccc
index 6723f8e38e70..29126bb4e2ab 100644
--- a/integration/schema-language-server/language-server/src/main/ccc/rankingexpression/RankingExpressionParser.ccc
+++ b/integration/schema-language-server/language-server/src/main/ccc/rankingexpression/RankingExpressionParser.ccc
@@ -21,6 +21,7 @@ options {
 
 INJECT RankingExpressionParser :
     import com.yahoo.searchlib.rankingexpression.Reference;
+    import com.yahoo.searchlib.rankingexpression.parser.CellMapHelper;
     import com.yahoo.searchlib.rankingexpression.rule.*;
     import com.yahoo.searchlib.rankingexpression.evaluation.Value;
     import com.yahoo.searchlib.rankingexpression.evaluation.StringValue;
@@ -1105,48 +1106,52 @@ DynamicTensor mappedTensorValueBody(TensorType type) :
 
 DynamicTensor mixedTensorValueBody(TensorType type, List dimensionOrder) :
 {
-    java.util.Map cells = new LinkedHashMap();
+    CellMapHelper cells = new CellMapHelper(type, dimensionOrder);
 }
- 
+    mixedValueObject(cells)
+    { return DynamicTensor.from(type, cells.map()); }
+;
+
+mixedValueObject(CellMapHelper cells) :
     <LCURLY>
-        keyValueOrMixedBlock(type, dimensionOrder, cells)
-        ( <COMMA> keyValueOrMixedBlock(type, dimensionOrder, cells))*
+        keyValueOrMixedBlock(cells)
+        ( <COMMA> keyValueOrMixedBlock(cells))*
     <RCURLY>
-    { return DynamicTensor.from(type, cells); }
 ;
 
 DynamicTensor indexedTensorValueBody(TensorType type, List dimensionOrder) :
 {
     List cells;
 }
- 
     cells = indexedTensorCells()
     { return DynamicTensor.from(type, TensorFunctionNode.wrapScalars(type, dimensionOrder, cells)); }
 ;
 
-void keyValueOrMixedBlock(TensorType type, List dimensionOrder, java.util.Map cellMap) : {}
- 
-    SCAN 3 mixedBlock(type, dimensionOrder, cellMap) | keyValue(type, cellMap)
+keyValueOrMixedBlock(CellMapHelper cellMap) :
+{
+    String label;
+    CellMapHelper next;
+}
+    label = label <COLON> { next = cellMap.bind(label); }
+    (
+        keyValue(next) | mixedBlock(next) | mixedValueObject(next)
+    )
 ;
 
-void keyValue(TensorType type, java.util.Map cellMap) :
+keyValue(CellMapHelper cellMap) :
 {
-    String label;
     ExpressionNode value;
 }
- 
-    label = label() <COLON> value = expression()
-    { cellMap.put(TensorAddress.ofLabels(label), TensorFunctionNode.wrapScalar(value)); }
+    value = expression
+    { cellMap.handleScalar(value); }
 ;
 
-void mixedBlock(TensorType type, List dimensionOrder, java.util.Map cellMap) :
+mixedBlock(CellMapHelper cellMap) :
 {
-    String label;
     List cells;
 }
- 
-    label = label() <COLON> cells = indexedTensorCells()
-    { TensorFunctionNode.wrapScalarBlock(type, dimensionOrder, label, cells, cellMap); }
+    cells = indexedTensorCells
+    { cellMap.handleDenseSubspace(cells); }
 ;
 
 List indexedTensorCells() :
diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml
index c4b8a8ba8722..232cf342485d 100644
--- a/jdisc-cloud-aws/pom.xml
+++ b/jdisc-cloud-aws/pom.xml
@@ -56,6 +56,7 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-ssm</artifactId>
         </dependency>
+
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>secretsmanager</artifactId>
@@ -87,6 +88,22 @@
             </exclusions>
         </dependency>
 
+        <!-- Used by secretsmanager -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>ssm</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretStore.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretReader.java
similarity index 80%
rename from jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretStore.java
rename to jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretReader.java
index 6fcc54415c00..b386b92d87c6 100644
--- a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretStore.java
+++ b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretReader.java
@@ -1,18 +1,17 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.secret.aws;
 
 import ai.vespa.secret.config.aws.AsmSecretConfig;
 import ai.vespa.secret.internal.TypedSecretStore;
 import ai.vespa.secret.model.Key;
-import ai.vespa.secret.model.Role;
 import ai.vespa.secret.model.Secret;
 import ai.vespa.secret.model.SecretVersionId;
 import ai.vespa.secret.model.SecretVersionState;
-import ai.vespa.secret.model.VaultName;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import com.yahoo.component.annotation.Inject;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
+import com.yahoo.vespa.athenz.api.AwsRole;
 import com.yahoo.vespa.athenz.client.zts.DefaultZtsClient;
 import com.yahoo.vespa.athenz.client.zts.ZtsClient;
 import com.yahoo.vespa.athenz.identity.ServiceIdentityProvider;
@@ -32,42 +31,52 @@
 import java.util.function.Function;
 
 /**
- * A read-only client for AWS Secrets Manager, with caching of secrets.
- * Based on ASMSecretStore in hosted-configserver.
+ * Base class for read-only client for AWS Secrets Manager, with caching of secrets.
  *
  * @author gjoranv
  */
-public final class AsmSecretStore extends AsmSecretStoreBase implements TypedSecretStore {
+public abstract class AsmSecretReader extends AsmSecretStoreBase
+        implements TypedSecretStore {
 
     private static final Duration CACHE_EXPIRE = Duration.ofMinutes(30);
 
     private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(5);
 
     private final LoadingCache<VersionKey, Secret> cache;
-    private final Runnable closeable;
+    private final Runnable ztsClientCloser;
 
     protected record VersionKey(Key key, SecretVersionId version) {}
 
-    @Inject
-    public AsmSecretStore(AsmSecretConfig config, ServiceIdentityProvider identities) {
-        this(URI.create(config.ztsUri()), identities.getIdentitySslContext(), athenzDomain(config, identities));
+    // For subclasses using dependency injection
+    public AsmSecretReader(AsmSecretConfig config, ServiceIdentityProvider identities) {
+        this(ztsClient(URI.create(config.ztsUri()), identities.getIdentitySslContext()),
+             athenzDomain(config, identities));
     }
 
-    public AsmSecretStore(URI ztsUri, SSLContext sslContext, AthenzDomain domain) {
-        this(new DefaultZtsClient.Builder(ztsUri).withSslContext(sslContext).build(), domain);
+    public AsmSecretReader(URI ztsUri, SSLContext sslContext, AthenzDomain domain) {
+        this(ztsClient(ztsUri, sslContext), domain);
     }
 
-    private AsmSecretStore(ZtsClient ztsClient, AthenzDomain domain) {
-        super(ztsClient, Role.READER, domain);
+    private AsmSecretReader(ZtsClient ztsClient, AthenzDomain domain) {
+        super(ztsClient, domain);
         cache = initCache();
-        closeable = ztsClient::close;
+        ztsClientCloser = ztsClient::close;
     }
 
     // For testing
-    AsmSecretStore(Function<VaultName, SecretsManagerClient> clientAndCredentialsSupplier) {
+    public AsmSecretReader(Function<AwsRole, SecretsManagerClient> clientAndCredentialsSupplier) {
         super(clientAndCredentialsSupplier);
         cache = initCache();
-        closeable = () -> {};
+        ztsClientCloser = () -> {};
+    }
+
+
+    /** Returns the AWS secret id to use for the given key. */
+    protected abstract String awsSecretId(Key key);
+
+
+    private static ZtsClient ztsClient(URI ztsUri, SSLContext sslContext) {
+        return new DefaultZtsClient.Builder(ztsUri).withSslContext(sslContext).build();
     }
 
     private static AthenzDomain athenzDomain(AsmSecretConfig config, ServiceIdentityProvider identities) {
@@ -122,6 +131,7 @@ private static SecretVersionState toSecretVersionState(List<String> versionStage
     /**
      * If version is null, the version with label AWSCURRENT is returned.
      */
+    @Override
     public Secret getSecret(Key key, SecretVersionId version) {
         try {
             return cache.getUnchecked(new VersionKey(key, version));
@@ -160,19 +170,19 @@ public List<Secret> listSecretVersions(Key key) {
         return secretVersions;
     }
 
-    @Override
-    public Type type() {
-        return Type.PUBLIC;
-    }
-
     @Override
     public void close() {
         scheduler.shutdown();
-        closeable.run();
+        ztsClientCloser.run();
         super.close();
     }
 
-        @Override
+    @Override
+    public Type type() {
+        return Type.PUBLIC;
+    }
+
+    @Override
     public String getSecret(String key) {
         throw new UnsupportedOperationException("This secret store does not support String lookups.");
     }
diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretStoreBase.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretStoreBase.java
index a1cc3cfb0aa1..6eb12990f1c3 100644
--- a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretStoreBase.java
+++ b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretStoreBase.java
@@ -1,7 +1,6 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.secret.aws;
 
-import ai.vespa.secret.model.Key;
-import ai.vespa.secret.model.Role;
 import ai.vespa.secret.model.VaultName;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
@@ -27,30 +26,37 @@ public abstract class AsmSecretStoreBase extends AbstractComponent implements Au
 
     public static final String AWSCURRENT = "AWSCURRENT";
 
-    private final ConcurrentMap<VaultName, SecretsManagerClient> clientMap = new ConcurrentHashMap<>();
-    private final Function<VaultName, SecretsManagerClient> clientAndCredentialsSupplier;
+    private final Function<AwsRole, SecretsManagerClient> clientAndCredentialsSupplier;
 
+    private final ConcurrentMap<AwsRole, SecretsManagerClient> clientMap = new ConcurrentHashMap<>();
 
-    public AsmSecretStoreBase(ZtsClient ztsClient, Role role, AthenzDomain athenzDomain) {
-        this(vault -> SecretsManagerClient.builder().region(Region.US_EAST_1)
-                .credentialsProvider(getAwsSessionCredsProvider(ztsClient, athenzDomain, role, vault))
-                .build());
+
+    public AsmSecretStoreBase(ZtsClient ztsClient, AthenzDomain athenzDomain) {
+        this(awsRole -> SecretsManagerClient.builder().region(Region.US_EAST_1)
+                     .credentialsProvider(getAwsSessionCredsProvider(awsRole, ztsClient, athenzDomain))
+                     .build()
+        );
     }
 
-    AsmSecretStoreBase(Function<VaultName, SecretsManagerClient> clientAndCredentialsSupplier) {
+    AsmSecretStoreBase(Function<AwsRole, SecretsManagerClient> clientAndCredentialsSupplier) {
         this.clientAndCredentialsSupplier = clientAndCredentialsSupplier;
     }
 
+    /** Returns the AWS role associated with the given vault. */
+    protected abstract AwsRole awsRole(VaultName vault);
+
 
-    protected SecretsManagerClient getClient(VaultName vaultName) {
-        // TODO: Use role name instead of vault name
-        return clientMap.computeIfAbsent(vaultName, clientAndCredentialsSupplier);
+    protected SecretsManagerClient getClient(VaultName vault) {
+        var awsRole = awsRole(vault);
+        clientMap.putIfAbsent(awsRole, clientAndCredentialsSupplier.apply(awsRole));
+        return clientMap.get(awsRole);
     }
 
-    private static AwsCredentialsProvider getAwsSessionCredsProvider(ZtsClient ztsClient, AthenzDomain athenzDomain, Role role, VaultName vaultName) {
-        var awsRole = new AwsRole(role.forVault(vaultName));
-        AwsCredentials credentials = new AwsCredentials(ztsClient, athenzDomain, awsRole);
+    private static AwsCredentialsProvider getAwsSessionCredsProvider(AwsRole role,
+                                                                     ZtsClient ztsClient,
+                                                                     AthenzDomain athenzDomain) {
 
+        AwsCredentials credentials = new AwsCredentials(ztsClient, athenzDomain, role);
         return () -> {
             AwsTemporaryCredentials temporary = credentials.get();
             return AwsSessionCredentials.create(temporary.accessKeyId(),
@@ -59,10 +65,6 @@ private static AwsCredentialsProvider getAwsSessionCredsProvider(ZtsClient ztsCl
         };
     }
 
-    protected String awsSecretId(Key key) {
-        return key.vaultName().value() + "/" + key.secretName();
-    }
-
     @Override
     public void close() {
         clientMap.values().forEach(client -> {
diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmTenantSecretReader.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmTenantSecretReader.java
new file mode 100644
index 000000000000..2839986091ce
--- /dev/null
+++ b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmTenantSecretReader.java
@@ -0,0 +1,59 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package ai.vespa.secret.aws;
+
+import ai.vespa.secret.config.aws.AsmSecretConfig;
+import ai.vespa.secret.model.Key;
+import ai.vespa.secret.model.VaultName;
+import com.yahoo.component.annotation.Inject;
+import com.yahoo.vespa.athenz.api.AwsRole;
+import com.yahoo.vespa.athenz.identity.ServiceIdentityProvider;
+import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
+
+import java.util.function.Function;
+
+/**
+ * Secret reader for tenant nodes.
+ *
+ * @author gjoranv
+ */
+public final class AsmTenantSecretReader extends AsmSecretReader {
+
+    private final String system;
+    private final String tenant;
+
+    @Inject
+    public AsmTenantSecretReader(AsmSecretConfig config, ServiceIdentityProvider identities) {
+        super(config, identities);
+        this.system = config.system();
+        this.tenant = config.tenant();
+    }
+
+    // For testing
+    AsmTenantSecretReader(Function<AwsRole, SecretsManagerClient> clientAndCredentialsSupplier,
+                          String system, String tenant) {
+        super(clientAndCredentialsSupplier);
+        this.system = system;
+        this.tenant = tenant;
+    }
+
+    @Override
+    protected AwsRole awsRole(VaultName vault) {
+        return new AwsRole(AthenzUtil.resourceEntityName(system, tenant, vault));
+    }
+
+    @Override
+    protected String awsSecretId(Key key) {
+        return awsSecretId(tenant, key);
+    }
+
+    // Note: TenantName cannot be used here, as config-provisioning is not available on tenant nodes.
+
+    private String awsSecretId(String tenant, Key key) {
+        return getAwsSecretId(system, tenant, key);
+    }
+
+    public static String getAwsSecretId(String system, String tenant, Key key) {
+        return "%s.%s.%s/%s".formatted(system, tenant, key.vaultName().value(), key.secretName().value());
+    }
+
+}
diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AthenzUtil.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AthenzUtil.java
new file mode 100644
index 000000000000..cbe12a69a402
--- /dev/null
+++ b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AthenzUtil.java
@@ -0,0 +1,32 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package ai.vespa.secret.aws;
+
+import ai.vespa.secret.model.Role;
+import ai.vespa.secret.model.VaultName;
+
+
+/**
+ * Tenant secret store constants and functions used across modules and repos.
+ * Note that we cannot use SystemName and TenantName from config-provision here,
+ * as that bundle is not available in tenant containers.
+ * @author gjoranv
+ */
+public class AthenzUtil {
+
+    public static final String PREFIX = "tenant-secret";
+
+    public static String roleAndPolicyPrefix(String systemName, String tenantName) {
+        return "%s.%s.%s".formatted(PREFIX, systemName, tenantName).toLowerCase();
+    }
+
+    public static String resourceEntityName(String system, String tenant, VaultName vault) {
+        // Note that the domain name is added by AthenzDomainName, such that actual resource name will be
+        // e.g. vespa.external.tenant-secret:<aws-role-name>
+        // The aws role name is: tenant-secret.<system>.<tenant>.<vault>.reader
+        return "%s.%s.%s".formatted(roleAndPolicyPrefix(system, tenant),
+                                    vault.value(),
+                                    Role.READER.value())
+                .toLowerCase();
+    }
+
+}
diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/SecretsImpl.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/SecretsImpl.java
index 1cd02caefd86..e54b5338125d 100644
--- a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/SecretsImpl.java
+++ b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/SecretsImpl.java
@@ -1,3 +1,4 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.secret.aws;
 
 import ai.vespa.secret.Secret;
@@ -21,8 +22,8 @@ public class SecretsImpl implements Secrets {
     private final TypedSecretStore secretStore;
 
     @Inject
-    public SecretsImpl(SecretsConfig config, AsmSecretStore asmSecretStore) {
-        this.secretStore = asmSecretStore;
+    public SecretsImpl(SecretsConfig config, AsmSecretReader asmSecretReader) {
+        this.secretStore = asmSecretReader;
         this.secretsConfig = config;
     }
 
diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/testutil/AsmSecretStoreTester.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/testutil/AsmSecretStoreTester.java
new file mode 100644
index 000000000000..818eb18ad4db
--- /dev/null
+++ b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/testutil/AsmSecretStoreTester.java
@@ -0,0 +1,136 @@
+/*
+ * // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+ *
+ */
+
+package ai.vespa.secret.aws.testutil;
+
+import ai.vespa.secret.model.Key;
+import ai.vespa.secret.model.SecretVersionState;
+import com.yahoo.vespa.athenz.api.AwsRole;
+import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
+import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
+import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
+import software.amazon.awssdk.services.secretsmanager.model.InternalServiceErrorException;
+import software.amazon.awssdk.services.secretsmanager.model.InvalidNextTokenException;
+import software.amazon.awssdk.services.secretsmanager.model.InvalidParameterException;
+import software.amazon.awssdk.services.secretsmanager.model.ListSecretVersionIdsRequest;
+import software.amazon.awssdk.services.secretsmanager.model.ListSecretVersionIdsResponse;
+import software.amazon.awssdk.services.secretsmanager.model.ResourceNotFoundException;
+import software.amazon.awssdk.services.secretsmanager.model.SecretVersionsListEntry;
+import software.amazon.awssdk.services.secretsmanager.model.SecretsManagerException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ *
+ * @author gjoranv
+ */
+public class AsmSecretStoreTester {
+
+    public record SecretVersion(String version, SecretVersionState state, String value) {}
+
+    private final Map<String, List<SecretVersion>> secrets = new HashMap<>();
+    private final List<MockSecretsManagerClient> clients = new ArrayList<>();
+    private final Function<Key, String> awsSecretIdMapper;
+
+    public AsmSecretStoreTester(Function<Key, String> awsSecretId) {
+        this.awsSecretIdMapper = awsSecretId;
+    }
+
+    public void reset() {
+        secrets.clear();
+        clients.clear();
+    }
+
+    public void put(Key key, SecretVersion... versions) {
+        secrets.put(awsSecretIdMapper.apply(key), List.of(versions));
+    }
+
+    public MockSecretsManagerClient newClient(AwsRole awsRole) {
+        return new MockSecretsManagerClient(awsRole);
+    }
+
+    public List<MockSecretsManagerClient> clients() {
+        return List.copyOf(clients);
+    }
+
+
+    public class MockSecretsManagerClient implements SecretsManagerClient {
+
+        public final AwsRole awsRole;
+        public boolean isClosed = false;
+
+        MockSecretsManagerClient(AwsRole awsRole) {
+            this.awsRole = awsRole;
+            clients.add(this);
+        }
+
+        @Override
+        public GetSecretValueResponse getSecretValue(GetSecretValueRequest request) {
+            String id = request.secretId();
+            String reqVersion = request.versionId();
+
+            var versions = secrets.get(id);
+            if (versions == null) {
+                throw ResourceNotFoundException.builder().message("Secret not found").build();
+            }
+            var secret = findSecret(versions, reqVersion);
+            return GetSecretValueResponse.builder()
+                    .name(request.secretId())
+                    .secretString(secret.value())
+                    .versionId(secret.version)
+                    .versionStages(List.of(toAwsStage(secret.state)))
+                    .build();
+        }
+
+        SecretVersion findSecret(List<SecretVersion> versions, String reqVersion) {
+            return versions.stream()
+                    .filter(reqVersion == null ?
+                                    v -> v.state() == SecretVersionState.CURRENT
+                                    : v -> v.version().equals(reqVersion))
+                    .findFirst()
+                    .orElseThrow(() -> ResourceNotFoundException.builder().message("Version not found: " + reqVersion).build());
+        }
+
+        @Override
+        public ListSecretVersionIdsResponse listSecretVersionIds(ListSecretVersionIdsRequest request) throws InvalidNextTokenException, ResourceNotFoundException, InternalServiceErrorException, InvalidParameterException, AwsServiceException, SdkClientException, SecretsManagerException {
+            return ListSecretVersionIdsResponse.builder()
+                    .name(request.secretId())
+                    .versions(secrets.getOrDefault(request.secretId(), List.of()).stream()
+                                      .map(version -> SecretVersionsListEntry.builder()
+                                              .versionId(version.version())
+                                              .versionStages(List.of(toAwsStage(version.state())))
+                                              .build())
+                                      .toList())
+                    .build();
+        }
+
+        @Override
+        public String serviceName() {
+            return AsmSecretStoreTester.class.getSimpleName();
+        }
+
+        @Override
+        public void close() {
+            isClosed = true;
+        }
+
+        private String toAwsStage(SecretVersionState state) {
+            return switch (state) {
+                case CURRENT -> "AWSCURRENT";
+                case PENDING -> "AWSPENDING";
+                case PREVIOUS -> "AWSPREVIOUS";
+                default -> throw new IllegalArgumentException("Unknown state: " + state);
+            };
+        }
+
+    }
+
+}
diff --git a/jdisc-cloud-aws/src/main/java/software/amazon/awssdk/services/secretsmanager/model/package-info.java b/jdisc-cloud-aws/src/main/java/software/amazon/awssdk/services/secretsmanager/model/package-info.java
new file mode 100644
index 000000000000..a93d6b20c3fb
--- /dev/null
+++ b/jdisc-cloud-aws/src/main/java/software/amazon/awssdk/services/secretsmanager/model/package-info.java
@@ -0,0 +1,4 @@
+@ExportPackage
+package software.amazon.awssdk.services.secretsmanager.model;
+
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/jdisc-cloud-aws/src/main/java/software/amazon/awssdk/services/secretsmanager/package-info.java b/jdisc-cloud-aws/src/main/java/software/amazon/awssdk/services/secretsmanager/package-info.java
new file mode 100644
index 000000000000..8fe17af84492
--- /dev/null
+++ b/jdisc-cloud-aws/src/main/java/software/amazon/awssdk/services/secretsmanager/package-info.java
@@ -0,0 +1,4 @@
+@ExportPackage
+package software.amazon.awssdk.services.secretsmanager;
+
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/jdisc-cloud-aws/src/test/java/ai/vespa/secret/aws/AsmSecretStoreTest.java b/jdisc-cloud-aws/src/test/java/ai/vespa/secret/aws/AsmSecretStoreTest.java
deleted file mode 100644
index 3ca3d4087def..000000000000
--- a/jdisc-cloud-aws/src/test/java/ai/vespa/secret/aws/AsmSecretStoreTest.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package ai.vespa.secret.aws;
-
-import ai.vespa.secret.model.Key;
-import ai.vespa.secret.model.Secret;
-import ai.vespa.secret.model.SecretName;
-import ai.vespa.secret.model.SecretVersionId;
-import ai.vespa.secret.model.SecretVersionState;
-import ai.vespa.secret.model.VaultName;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
-import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
-import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
-import software.amazon.awssdk.services.secretsmanager.model.InternalServiceErrorException;
-import software.amazon.awssdk.services.secretsmanager.model.InvalidNextTokenException;
-import software.amazon.awssdk.services.secretsmanager.model.InvalidParameterException;
-import software.amazon.awssdk.services.secretsmanager.model.ListSecretVersionIdsRequest;
-import software.amazon.awssdk.services.secretsmanager.model.ListSecretVersionIdsResponse;
-import software.amazon.awssdk.services.secretsmanager.model.ResourceNotFoundException;
-import software.amazon.awssdk.services.secretsmanager.model.SecretVersionsListEntry;
-import software.amazon.awssdk.services.secretsmanager.model.SecretsManagerException;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * @author gjoranv
- */
-public class AsmSecretStoreTest {
-
-    record SecretVersion(String version, SecretVersionState state, String value) {}
-
-    static final Map<Key, List<SecretVersion>> secrets = new HashMap<>();
-    static final List<MockSecretsManagerClient> clients = new ArrayList<>();
-
-    @BeforeEach
-    void reset() {
-        secrets.clear();
-        clients.clear();
-    }
-
-    AsmSecretStore createStore() {
-        return new AsmSecretStore(MockSecretsManagerClient::new);
-    }
-
-    @Test
-    void it_creates_one_credentials_and_client_per_vault_and_closes_them() {
-        var vault1 = VaultName.of("vault1");
-        var vault2 = VaultName.of("vault2");
-
-        var secret1 = new SecretVersion("1", SecretVersionState.CURRENT, "secret1");
-        var secret2 = new SecretVersion("2", SecretVersionState.CURRENT, "secret2");
-
-        var key1 = new Key(vault1, SecretName.of("secret1"));
-        var key2 = new Key(vault2, SecretName.of("secret2"));
-
-        secrets.put(key1, List.of(secret1));
-        secrets.put(key2, List.of(secret2));
-
-        try (var store = createStore()){
-            store.getSecret(key1);
-            store.getSecret(key2);
-
-            assertEquals(2, clients.size());
-        }
-        assertTrue(clients.stream().allMatch(c -> c.isClosed));
-    }
-
-    @Test
-    void it_returns_secret_with_given_version() {
-        var vault = VaultName.of("vault1");
-        var key = new Key(vault, SecretName.of("secret1"));
-
-        var expected1 = new SecretVersion("1", SecretVersionState.CURRENT, "v1");
-        var expected2 = new SecretVersion("2", SecretVersionState.PENDING, "v2");
-        secrets.put(key, List.of(expected1, expected2));
-
-        try (var store = createStore()) {
-            var retrieved1 = store.getSecret(key, SecretVersionId.of("1"));
-            var retrieved2 = store.getSecret(key, SecretVersionId.of("2"));
-
-            assertSame(expected1, retrieved1);
-            assertSame(expected2, retrieved2);
-        }
-    }
-
-    @Test
-    void it_returns_current_version_if_no_version_is_given() {
-        var vault = VaultName.of("vault1");
-        var key = new Key(vault, SecretName.of("secret1"));
-
-        var current = new SecretVersion("1", SecretVersionState.CURRENT, "current");
-        var pending = new SecretVersion("2", SecretVersionState.PENDING, "pending");
-        secrets.put(key, List.of(current, pending));
-
-        try (var store = createStore()) {
-            var retrieved = store.getSecret(key);
-            assertSame(current, retrieved);
-        }
-    }
-
-    @Test
-    void it_throws_exception_if_secret_not_found() {
-        var vault = VaultName.of("vault1");
-        var key = new Key(vault, SecretName.of("secret1"));
-        try (var store = createStore()) {
-            var e = assertThrows(IllegalArgumentException.class, () -> store.getSecret(key));
-            assertEquals("Failed to retrieve current version of secret with key vault1/secret1", e.getMessage());
-
-            e = assertThrows(IllegalArgumentException.class, () -> store.getSecret(key, SecretVersionId.of("1")));
-            assertEquals("Failed to retrieve secret with key vault1/secret1, version: 1", e.getMessage());
-        }
-    }
-
-    @Test
-    void it_throws_exception_if_version_not_found() {
-        var vault = VaultName.of("vault1");
-        var key = new Key(vault, SecretName.of("secret1"));
-
-        var v1 = new SecretVersion("1", SecretVersionState.CURRENT, "v1");
-        secrets.put(key, List.of(v1));
-
-        try (var store = createStore()) {
-            var e = assertThrows(IllegalArgumentException.class, () -> store.getSecret(key, SecretVersionId.of("2")));
-            assertEquals("Failed to retrieve secret with key vault1/secret1, version: 2", e.getMessage());
-        }
-
-    }
-
-    @Test
-    void it_lists_secret_versions_in_sorted_order() {
-        var vault = VaultName.of("vault1");
-        var key = new Key(vault, SecretName.of("secret1"));
-
-        var prev = new SecretVersion("1", SecretVersionState.PREVIOUS, "v1");
-        var curr = new SecretVersion("2", SecretVersionState.CURRENT, "v2");
-        var pend = new SecretVersion("3", SecretVersionState.PENDING, "v3");
-
-        secrets.put(key, List.of(prev, pend, curr));
-        try (var store = createStore()) {
-            var versions = store.listSecretVersions(key);
-            assertEquals(3, versions.size());
-            assertSame(pend, versions.get(0));
-            assertSame(curr, versions.get(1));
-            assertSame(prev, versions.get(2));
-        }
-    }
-
-    @Test
-    void it_returns_empty_list_of_versions_for_unknown_secret() {
-        var vault = VaultName.of("vault1");
-        var key = new Key(vault, SecretName.of("secret1"));
-        try (var store = createStore()) {
-            var versions = store.listSecretVersions(key);
-            assertEquals(0, versions.size());
-        }
-    }
-
-    private void assertSame(SecretVersion version, Secret secret) {
-        assertEquals(version.value(), secret.secretAsString());
-        assertEquals(version.version(), secret.version().value());
-    }
-
-    private static Key toKey(String awsId) {
-        var parts = awsId.split("/");
-        return new Key(VaultName.of(parts[0]), SecretName.of(parts[1]));
-    }
-
-    private static class MockSecretsManagerClient implements SecretsManagerClient {
-        final VaultName vault;
-        boolean isClosed = false;
-
-        MockSecretsManagerClient(VaultName vault) {
-            this.vault = vault;
-            clients.add(this);
-        }
-
-        @Override
-        public GetSecretValueResponse getSecretValue(GetSecretValueRequest request) {
-            String id = request.secretId();
-            String reqVersion = request.versionId();
-
-            var versions = secrets.get(toKey(id));
-            if (versions == null) {
-                throw ResourceNotFoundException.builder().message("Secret not found").build();
-            }
-            var secret = findSecret(versions, reqVersion);
-            return GetSecretValueResponse.builder()
-                    .name(request.secretId())
-                    .secretString(secret.value())
-                    .versionId(secret.version)
-                    .versionStages(List.of(toAwsStage(secret.state)))
-                    .build();
-        }
-
-        SecretVersion findSecret(List<SecretVersion> versions, String reqVersion) {
-            return versions.stream()
-                    .filter(reqVersion == null ?
-                                    v -> v.state() == SecretVersionState.CURRENT
-                                    : v -> v.version().equals(reqVersion))
-                    .findFirst()
-                    .orElseThrow(() -> ResourceNotFoundException.builder().message("Version not found: " + reqVersion).build());
-        }
-
-        @Override
-        public ListSecretVersionIdsResponse listSecretVersionIds(ListSecretVersionIdsRequest request) throws InvalidNextTokenException, ResourceNotFoundException, InternalServiceErrorException, InvalidParameterException, AwsServiceException, SdkClientException, SecretsManagerException {
-            return ListSecretVersionIdsResponse.builder()
-                    .name(request.secretId())
-                    .versions(secrets.getOrDefault(toKey(request.secretId()), List.of()).stream()
-                                      .map(version -> SecretVersionsListEntry.builder()
-                                              .versionId(version.version())
-                                              .versionStages(List.of(toAwsStage(version.state())))
-                                              .build())
-                                      .toList())
-                    .build();
-        }
-
-        private String toAwsStage(SecretVersionState state) {
-            return switch(state) {
-                case CURRENT -> "AWSCURRENT";
-                case PENDING -> "AWSPENDING";
-                case PREVIOUS -> "AWSPREVIOUS";
-                default -> throw new IllegalArgumentException("Unknown state: " + state);
-            };
-        }
-
-        @Override
-        public String serviceName() {
-            return MockSecretsManagerClient.class.getSimpleName();
-        }
-
-        @Override
-        public void close() {
-            isClosed = true;
-        }
-    }
-
-}
diff --git a/jdisc-cloud-aws/src/test/java/ai/vespa/secret/aws/AsmTenantSecretReaderTest.java b/jdisc-cloud-aws/src/test/java/ai/vespa/secret/aws/AsmTenantSecretReaderTest.java
new file mode 100644
index 000000000000..4c32f9d2688d
--- /dev/null
+++ b/jdisc-cloud-aws/src/test/java/ai/vespa/secret/aws/AsmTenantSecretReaderTest.java
@@ -0,0 +1,161 @@
+package ai.vespa.secret.aws;
+
+import ai.vespa.secret.aws.testutil.AsmSecretStoreTester;
+import ai.vespa.secret.aws.testutil.AsmSecretStoreTester.SecretVersion;
+import ai.vespa.secret.model.Key;
+import ai.vespa.secret.model.Secret;
+import ai.vespa.secret.model.SecretName;
+import ai.vespa.secret.model.SecretVersionId;
+import ai.vespa.secret.model.SecretVersionState;
+import ai.vespa.secret.model.VaultName;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author gjoranv
+ */
+public class AsmTenantSecretReaderTest {
+
+    AsmSecretStoreTester tester = new AsmSecretStoreTester(this::awsSecretId);
+    
+    String system = "publiccd";
+    String tenant = "tenant1";
+
+    // The mapping from Key to AWS secret id for tenant secrets
+    private String awsSecretId(Key key) {
+        return "%s.%s.%s/%s".formatted(
+                system, tenant, key.vaultName().value(), key.secretName().value());
+    }
+
+    @BeforeEach
+    void reset() {
+        tester.reset();
+    }
+
+    AsmTenantSecretReader secretReader() {
+        return new AsmTenantSecretReader(tester::newClient, system, tenant);
+    }
+
+    @Test
+    void it_creates_one_credentials_and_client_per_vault_and_closes_them() {
+        var vault1 = VaultName.of("vault1");
+        var vault2 = VaultName.of("vault2");
+
+        var secret1 = new SecretVersion("1", SecretVersionState.CURRENT, "secret1");
+        var secret2 = new SecretVersion("2", SecretVersionState.CURRENT, "secret2");
+
+        var key1 = new Key(vault1, SecretName.of("secret1"));
+        var key2 = new Key(vault2, SecretName.of("secret2"));
+
+        tester.put(key1, secret1);
+        tester.put(key2, secret2);
+
+        try (var reader = secretReader()){
+            reader.getSecret(key1);
+            reader.getSecret(key2);
+
+            assertEquals(2, tester.clients().size());
+        }
+        assertTrue(tester.clients().stream().allMatch(c -> c.isClosed));
+    }
+
+    @Test
+    void it_returns_secret_with_given_version() {
+        var vault = VaultName.of("vault1");
+        var key = new Key(vault, SecretName.of("secret1"));
+
+        var expected1 = new SecretVersion("1", SecretVersionState.CURRENT, "v1");
+        var expected2 = new SecretVersion("2", SecretVersionState.PENDING, "v2");
+        tester.put(key, expected1, expected2);
+
+        try (var reader = secretReader()) {
+            var retrieved1 = reader.getSecret(key, SecretVersionId.of("1"));
+            var retrieved2 = reader.getSecret(key, SecretVersionId.of("2"));
+
+            assertSame(expected1, retrieved1);
+            assertSame(expected2, retrieved2);
+        }
+    }
+
+    @Test
+    void it_returns_current_version_if_no_version_is_given() {
+        var vault = VaultName.of("vault1");
+        var key = new Key(vault, SecretName.of("secret1"));
+
+        var current = new SecretVersion("1", SecretVersionState.CURRENT, "current");
+        var pending = new SecretVersion("2", SecretVersionState.PENDING, "pending");
+        tester.put(key, current, pending);
+
+        try (var store = secretReader()) {
+            var retrieved = store.getSecret(key);
+            assertSame(current, retrieved);
+        }
+    }
+
+    @Test
+    void it_throws_exception_if_secret_not_found() {
+        var vault = VaultName.of("vault1");
+        var key = new Key(vault, SecretName.of("secret1"));
+        try (var store = secretReader()) {
+            var e = assertThrows(IllegalArgumentException.class, () -> store.getSecret(key));
+            assertEquals("Failed to retrieve current version of secret with key vault1/secret1", e.getMessage());
+
+            e = assertThrows(IllegalArgumentException.class, () -> store.getSecret(key, SecretVersionId.of("1")));
+            assertEquals("Failed to retrieve secret with key vault1/secret1, version: 1", e.getMessage());
+        }
+    }
+
+    @Test
+    void it_throws_exception_if_version_not_found() {
+        var vault = VaultName.of("vault1");
+        var key = new Key(vault, SecretName.of("secret1"));
+
+        var v1 = new SecretVersion("1", SecretVersionState.CURRENT, "v1");
+        tester.put(key, v1);
+
+        try (var store = secretReader()) {
+            var e = assertThrows(IllegalArgumentException.class, () -> store.getSecret(key, SecretVersionId.of("2")));
+            assertEquals("Failed to retrieve secret with key vault1/secret1, version: 2", e.getMessage());
+        }
+
+    }
+
+    @Test
+    void it_lists_secret_versions_in_sorted_order() {
+        var vault = VaultName.of("vault1");
+        var key = new Key(vault, SecretName.of("secret1"));
+
+        var prev = new SecretVersion("1", SecretVersionState.PREVIOUS, "v1");
+        var curr = new SecretVersion("2", SecretVersionState.CURRENT, "v2");
+        var pend = new SecretVersion("3", SecretVersionState.PENDING, "v3");
+
+        tester.put(key, prev, pend, curr);
+        try (var store = secretReader()) {
+            var versions = store.listSecretVersions(key);
+            assertEquals(3, versions.size());
+            assertSame(pend, versions.get(0));
+            assertSame(curr, versions.get(1));
+            assertSame(prev, versions.get(2));
+        }
+    }
+
+    @Test
+    void it_returns_empty_list_of_versions_for_unknown_secret() {
+        var vault = VaultName.of("vault1");
+        var key = new Key(vault, SecretName.of("secret1"));
+        try (var store = secretReader()) {
+            var versions = store.listSecretVersions(key);
+            assertEquals(0, versions.size());
+        }
+    }
+
+    private void assertSame(SecretVersion version, Secret secret) {
+        assertEquals(version.value(), secret.secretAsString());
+        assertEquals(version.version(), secret.version().value());
+    }
+
+}
diff --git a/metrics/src/vespa/metrics/valuemetric.h b/metrics/src/vespa/metrics/valuemetric.h
index 59159eb1ab71..c5a33862ded8 100644
--- a/metrics/src/vespa/metrics/valuemetric.h
+++ b/metrics/src/vespa/metrics/valuemetric.h
@@ -115,6 +115,11 @@ class ValueMetric : public AbstractValueMetric {
             addValueWithCount(avg, avg * count, count, min, max);
         }
     }
+    void addTotalValueBatch(TotVal tot, uint32_t count, AvgVal min, AvgVal max) {
+        if (count > 0) {
+            addValueWithCount(tot / count, tot, count, min, max);
+        }
+    }
     virtual void addValue(AvgVal avg) { addAvgValueWithCount(avg, 1); }
     virtual void set(AvgVal avg) { addValue(avg); }
     virtual void inc(AvgVal val = 1);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/Snapshot.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/Snapshot.java
index 9f4ed3c1268f..6869d1bb2801 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/Snapshot.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/Snapshot.java
@@ -1,11 +1,13 @@
 package com.yahoo.vespa.hosted.provision.backup;
 
+import com.google.common.collect.ImmutableMap;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.hosted.provision.node.ClusterId;
 
 import java.time.Instant;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 
 /**
@@ -13,37 +15,81 @@
  *
  * @author mpolden
  */
-public record Snapshot(String id, HostName hostname, State state, Instant createdAt, ClusterId cluster, int clusterIndex) {
+public record Snapshot(SnapshotId id, HostName hostname, State state, History history, ClusterId cluster, int clusterIndex) {
 
     public Snapshot {
         Objects.requireNonNull(id);
         Objects.requireNonNull(state);
         Objects.requireNonNull(hostname);
-        Objects.requireNonNull(createdAt);
+        Objects.requireNonNull(history);
         Objects.requireNonNull(cluster);
         if (clusterIndex < 0) {
             throw new IllegalArgumentException("clusterIndex cannot be negative, got " + cluster);
         }
     }
 
-    public Snapshot with(State state) {
-        if (state.compareTo(this.state) < 0) {
+    public Snapshot with(State state, Instant at) {
+        if (!canChangeTo(state)) {
             throw new IllegalArgumentException("Cannot change state of " + this + " to " + state);
         }
-        return new Snapshot(id, hostname, state, createdAt, cluster, clusterIndex);
+        return new Snapshot(id, hostname, state, history.with(state, at), cluster, clusterIndex);
+    }
+
+    private boolean canChangeTo(State state) {
+        // Allow repeated restores
+        if (state == State.restoring && this.state == State.restored) return true;
+        // Otherwise only allow state changes in the order of the state enum, and at most one step at a time
+        return state.compareTo(this.state) >= 0 &&
+               state.ordinal() - this.state.ordinal() <= 1;
+    }
+
+    /** A recording of the most recent time of each state change */
+    public record History(ImmutableMap<State, Event> events) {
+
+        public History {
+            Objects.requireNonNull(events);
+        }
+
+        public Optional<Event> event(State type) {
+            return Optional.ofNullable(events.get(type));
+        }
+
+        public History with(State type, Instant at) {
+            return new History(builderWithout(type).put(type, new Event(type, at)).build());
+        }
+
+        private ImmutableMap.Builder<State, Event> builderWithout(State type) {
+            ImmutableMap.Builder<State, Event> builder = ImmutableMap.builder();
+            events.forEach((t, at) -> {
+                if (t != type) {
+                    builder.put(t, at);
+                }
+            });
+            return builder;
+        }
+
+        public static History of(State type, Instant at) {
+            return new History(ImmutableMap.of(type, new Event(type, at)));
+        }
+
+        public record Event(State type, Instant at) {
+
+            public Event {
+                Objects.requireNonNull(type);
+                Objects.requireNonNull(at);
+            }
+
+        }
+
     }
 
     public enum State {
         /** Snapshot is being created by the node */
         creating,
-        /** The node failed to create a snapshot */
-        failed,
         /** The node successfully created a snapshot */
         created,
         /** Snapshot is being restored by the node */
         restoring,
-        /** The node failed to restore the snapshot */
-        restoreFailed,
         /** The node successfully created a snapshot */
         restored;
 
@@ -51,14 +97,19 @@ public enum State {
         public boolean busy() {
             return switch (this) {
                 case creating, restoring -> true;
-                case failed, created, restoreFailed, restored -> false;
+                case created, restored -> false;
             };
         }
 
     }
 
-    public static Snapshot create(HostName hostname, ClusterId cluster, int clusterIndex, Instant at) {
-        return new Snapshot(UUID.randomUUID().toString(), hostname, State.creating, at, cluster, clusterIndex);
+
+    public static SnapshotId generateId() {
+        return new SnapshotId(UUID.randomUUID());
+    }
+
+    public static Snapshot create(SnapshotId id, HostName hostname, Instant at, ClusterId cluster, int clusterIndex) {
+        return new Snapshot(id, hostname, State.creating, History.of(State.creating, at), cluster, clusterIndex);
     }
 
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/SnapshotId.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/SnapshotId.java
new file mode 100644
index 000000000000..885a34e9dff8
--- /dev/null
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/SnapshotId.java
@@ -0,0 +1,26 @@
+package com.yahoo.vespa.hosted.provision.backup;
+
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * Globally unique identifier of a snapshot.
+ *
+ * @author mpolden
+ */
+public record SnapshotId(UUID uuid) {
+
+    public SnapshotId {
+        Objects.requireNonNull(uuid);
+    }
+
+    @Override
+    public String toString() {
+        return uuid.toString();
+    }
+
+    public static SnapshotId of(String value) {
+        return new SnapshotId(UUID.fromString(value));
+    }
+
+}
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/Snapshots.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/Snapshots.java
index 4263bf45b417..da6cc766608e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/Snapshots.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/backup/Snapshots.java
@@ -7,6 +7,7 @@
 import com.yahoo.transaction.Mutex;
 import com.yahoo.transaction.NestedTransaction;
 import com.yahoo.vespa.hosted.provision.Node;
+import com.yahoo.vespa.hosted.provision.NodeMutex;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.Allocation;
@@ -46,7 +47,7 @@ public List<Snapshot> read(String hostname) {
     }
 
     /** Read given snapshot or throw */
-    public Snapshot require(String id, String hostname) {
+    public Snapshot require(SnapshotId id, String hostname) {
         return read(hostname).stream()
                              .filter(s -> s.id().equals(id))
                              .findFirst()
@@ -56,52 +57,109 @@ public Snapshot require(String id, String hostname) {
     /** Trigger a new snapshot for node of given hostname */
     public Snapshot create(String hostname, Instant instant) {
         try (var lock = db.lockSnapshots(hostname)) {
-            Optional<Snapshot> busySnapshot = read(hostname).stream().filter(s -> s.state().busy()).findFirst();
-            if (busySnapshot.isPresent()) {
-                throw new IllegalArgumentException("Cannot write snapshot " +
-                                                   ": Node " + hostname + " is busy with snapshot " +
-                                                   busySnapshot.get().id() + " in state " + busySnapshot.get().state());
-            }
-            return writeSnapshot(hostname, (node) -> {
+            SnapshotId id = Snapshot.generateId();
+            return write(id, hostname, (node) -> {
+                if (busy(node)) {
+                    throw new IllegalArgumentException("Cannot trigger new snapshot: Node " + hostname +
+                                                       " is busy with snapshot " + node.status().snapshot().get().id());
+                }
                 ClusterId cluster = new ClusterId(node.allocation().get().owner(), node.allocation().get().membership().cluster().id());
-                return Snapshot.create(com.yahoo.config.provision.HostName.of(hostname), cluster, node.allocation().get().membership().index(), instant);
+                return Optional.of(Snapshot.create(id, com.yahoo.config.provision.HostName.of(hostname), instant, cluster, node.allocation().get().membership().index()));
+            }, lock).get();
+        }
+    }
+
+    /** Restore a node to given snapshot */
+    public Snapshot restore(SnapshotId id, String hostname) {
+        try (var lock = db.lockSnapshots(hostname)) {
+            Snapshot snapshot = require(id, hostname);
+            Instant now = nodeRepository.clock().instant();
+            return write(id, hostname, (node) -> {
+                if (busy(node)) {
+                    throw new IllegalArgumentException("Cannot restore snapshot: Node " + hostname +
+                                                       " is busy with snapshot " + node.status().snapshot().get().id() + " in "+
+                                                       node.status().snapshot().get().state() + " state");
+                }
+                return Optional.of(snapshot.with(Snapshot.State.restoring, now));
+            }, lock).get();
+        }
+    }
+
+    /** Remove given snapshot. Note that this only removes metadata about the snapshot, and not the underlying data */
+    public void remove(SnapshotId id, String hostname, boolean force) {
+        try (var lock = db.lockSnapshots(hostname)) {
+            write(id, hostname, node -> {
+                if (busyWith(id, node) && !force) {
+                    throw new IllegalArgumentException("Cannot remove snapshot " + id +
+                                                       ": Node " + hostname + " is working on this snapshot");
+                }
+                return Optional.empty();
             }, lock);
         }
     }
 
-    /** Move snapshot to given state */
-    public Snapshot move(String snapshotId, String hostname, Snapshot.State newState) {
+    /** Change state of an active snapshot */
+    public Snapshot move(SnapshotId id, String hostname, Snapshot.State newState) {
         try (var lock = db.lockSnapshots(hostname)) {
-            Snapshot updated = require(snapshotId, hostname);
-            return writeSnapshot(hostname, node -> updated.with(newState), lock);
+            Snapshot current = require(id, hostname);
+            Instant now = nodeRepository.clock().instant();
+            return write(id, hostname, node -> {
+                if (!busyWith(id, node)) {
+                    throw new IllegalArgumentException("Cannot move snapshot " + id + " to " + newState +
+                                                       ": Node " + hostname + " is not working on this snapshot");
+                }
+                return Optional.of(current.with(newState, now));
+            }, lock).get();
         }
     }
 
-    private Snapshot writeSnapshot(String hostname, Function<Node, Snapshot> snapshotFunction, @SuppressWarnings("unused") Mutex snapshotLock) {
+    private boolean active(SnapshotId id, Node node) {
+        return node.status().snapshot().isPresent() && node.status().snapshot().get().id().equals(id);
+    }
+
+    private boolean busy(Node node) {
+        return node.status().snapshot().isPresent() && node.status().snapshot().get().state().busy();
+    }
+
+    private boolean busyWith(SnapshotId id, Node node) {
+        return active(id, node) && busy(node);
+    }
+
+    private Optional<Snapshot> write(SnapshotId id, String hostname, Function<Node, Optional<Snapshot>> snapshotFunction, @SuppressWarnings("unused") Mutex snapshotLock) {
         List<Snapshot> snapshots = read(hostname);
         try (var nodeMutex = nodeRepository.nodes().lockAndGetRequired(hostname)) {
-            Node node = nodeMutex.node();
-            if (node.state() != Node.State.active) throw new IllegalArgumentException("Node " + node + " must be " + Node.State.active + ", but is " + node.status());
-            if (node.type() != NodeType.tenant) throw new IllegalArgumentException("Node " + node + " has unexpected type " + node.type());
-            Optional<ClusterSpec> clusterSpec = node.allocation().map(Allocation::membership).map(ClusterMembership::cluster);
-            if (clusterSpec.isEmpty() || clusterSpec.get().type() != ClusterSpec.Type.content) {
-                throw new IllegalArgumentException("Node " + node + " is not a member of a content cluster: Refusing to write snapshot");
-            }
-            Snapshot snapshot = snapshotFunction.apply(node);
+            Node node = requireNode(nodeMutex);
+            Optional<Snapshot> snapshot = snapshotFunction.apply(node);
             try (var transaction = new NestedTransaction()) {
-                Node updatedNode = node.with(node.status().withSnapshot(snapshot));
-                db.writeTo(updatedNode.state(),
-                           List.of(updatedNode),
-                           Agent.system,
-                           Optional.empty(),
-                           transaction);
+                boolean removingActive = snapshot.isEmpty() && active(id, node);
+                boolean updating = snapshot.isPresent();
+                if (removingActive || updating) {
+                    Node updatedNode = node.with(node.status().withSnapshot(snapshot));
+                    db.writeTo(updatedNode.state(),
+                               List.of(updatedNode),
+                               Agent.system,
+                               Optional.empty(),
+                               transaction);
+                }
                 List<Snapshot> updated = new ArrayList<>(snapshots);
-                updated.add(snapshot);
-                db.writeSnapshots(snapshot.hostname().value(), updated, transaction);
+                updated.removeIf(s -> s.id().equals(id));
+                snapshot.ifPresent(updated::add);
+                db.writeSnapshots(hostname, updated, transaction);
                 transaction.commit();
             }
             return snapshot;
         }
     }
 
+    private static Node requireNode(NodeMutex nodeMutex) {
+        Node node = nodeMutex.node();
+        if (node.state() != Node.State.active) throw new IllegalArgumentException("Node " + node + " must be " + Node.State.active + ", but is " + node.status());
+        if (node.type() != NodeType.tenant) throw new IllegalArgumentException("Node " + node + " has unexpected type " + node.type());
+        Optional<ClusterSpec> clusterSpec = node.allocation().map(Allocation::membership).map(ClusterMembership::cluster);
+        if (clusterSpec.isEmpty() || clusterSpec.get().type() != ClusterSpec.Type.content) {
+            throw new IllegalArgumentException("Node " + node + " is not a member of a content cluster: Refusing to write snapshot");
+        }
+        return node;
+    }
+
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacer.java
index 7907a14e8fd5..fd9a1681dad2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacer.java
@@ -6,6 +6,7 @@
 import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeMutex;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
+import com.yahoo.vespa.hosted.provision.backup.Snapshot;
 import com.yahoo.vespa.hosted.provision.provisioning.HostProvisioner;
 import com.yahoo.vespa.hosted.provision.provisioning.HostProvisioner.RebuildResult;
 import com.yahoo.yolean.Exceptions;
@@ -44,9 +45,13 @@ protected double maintain() {
             rebuilding = locked.nodes().stream().map(NodeMutex::node).toList();
             RebuildResult result = hostProvisioner.replaceRootDisk(rebuilding);
 
-            for (Node updated : result.rebuilt())
-                if (!updated.status().wantToRebuild())
-                    nodeRepository().nodes().write(updated, () -> { });
+            for (Node updated : result.rebuilt()) {
+                if (!updated.status().wantToRebuild()) {
+                    NodeList children = nodeRepository().nodes().list().childrenOf(updated);
+                    restoreSnapshotsOf(children);
+                    nodeRepository().nodes().write(updated, () -> {});
+                }
+            }
 
             for (var entry : result.failed().entrySet()) {
                 ++failures;
@@ -57,4 +62,13 @@ protected double maintain() {
         return asSuccessFactorDeviation(rebuilding.size(), failures);
     }
 
+    private void restoreSnapshotsOf(NodeList children) {
+        for (Node child : children) {
+            Optional<Snapshot> snapshot = child.status().snapshot();
+            if (snapshot.isPresent() && snapshot.get().state() == Snapshot.State.created) {
+                nodeRepository().snapshots().restore(snapshot.get().id(), child.hostname());
+            }
+        }
+    }
+
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java
index 536a18254980..7ef9e1df0db4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java
@@ -163,8 +163,8 @@ public Optional<Snapshot> snapshot() {
     }
 
     /** Returns a copy of this with backup snapshot set to given value */
-    public Status withSnapshot(Snapshot snapshot) {
-        return new Status(reboot, vespaVersion, containerImage, failCount, wantToRetire, wantToDeprovision, wantToRebuild, preferToRetire, wantToFail, wantToUpgradeFlavor, osVersion, firmwareVerifiedAt, Optional.ofNullable(snapshot));
+    public Status withSnapshot(Optional<Snapshot> snapshot) {
+        return new Status(reboot, vespaVersion, containerImage, failCount, wantToRetire, wantToDeprovision, wantToRebuild, preferToRetire, wantToFail, wantToUpgradeFlavor, osVersion, firmwareVerifiedAt, snapshot);
     }
 
     /** Returns the initial status of a newly provisioned node */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/SnapshotSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/SnapshotSerializer.java
index 033f687e1d8d..55335360e9c9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/SnapshotSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/SnapshotSerializer.java
@@ -1,14 +1,17 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.persistence;
 
+import com.google.common.collect.ImmutableMap;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
+import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Inspector;
 import com.yahoo.slime.Slime;
 import com.yahoo.slime.SlimeUtils;
 import com.yahoo.vespa.hosted.provision.backup.Snapshot;
+import com.yahoo.vespa.hosted.provision.backup.SnapshotId;
 import com.yahoo.vespa.hosted.provision.node.ClusterId;
 
 import java.time.Instant;
@@ -23,21 +26,30 @@ public class SnapshotSerializer {
     private static final String ID_FIELD = "id";
     private static final String HOSTNAME_FIELD = "hostname";
     private static final String STATE_FIELD = "state";
-    private static final String CREATED_AT_FIELD = "createdAt";
     private static final String INSTANCE_FIELD = "instance";
     private static final String CLUSTER_FIELD = "cluster";
     private static final String CLUSTER_INDEX_FIELD = "clusterIndex";
+    private static final String HISTORY_FIELD = "history";
+    private static final String EVENT_FIELD = "event";
+    private static final String AT_FIELD = "at";
 
     private SnapshotSerializer() {}
 
     public static Snapshot fromInspector(Inspector object) {
-        return new Snapshot(object.field(ID_FIELD).asString(),
+        ImmutableMap.Builder<Snapshot.State, Snapshot.History.Event> history = ImmutableMap.builder();
+        object.field(HISTORY_FIELD).traverse((ArrayTraverser) (idx, inspector) -> {
+            Snapshot.State type = stateFromSlime(inspector.field(EVENT_FIELD).asString());
+            Instant at = Instant.ofEpochMilli(inspector.field(AT_FIELD).asLong());
+            history.put(type, new Snapshot.History.Event(type, at));
+        });
+        return new Snapshot(SnapshotId.of(object.field(ID_FIELD).asString()),
                             HostName.of(object.field(HOSTNAME_FIELD).asString()),
                             stateFromSlime(object.field(STATE_FIELD).asString()),
-                            Instant.ofEpochMilli(object.field(CREATED_AT_FIELD).asLong()),
+                            new Snapshot.History(history.build()),
                             new ClusterId(ApplicationId.fromSerializedForm(object.field(INSTANCE_FIELD).asString()),
                                           ClusterSpec.Id.from(object.field(CLUSTER_FIELD).asString())),
-                            (int) object.field(CLUSTER_INDEX_FIELD).asLong());
+                            (int) object.field(CLUSTER_INDEX_FIELD).asLong()
+        );
     }
 
     public static Snapshot fromSlime(Slime slime) {
@@ -68,22 +80,25 @@ public static Slime toSlime(List<Snapshot> snapshots) {
     }
 
     public static void toSlime(Snapshot snapshot, Cursor object) {
-        object.setString(ID_FIELD, snapshot.id());
+        object.setString(ID_FIELD, snapshot.id().toString());
         object.setString(HOSTNAME_FIELD, snapshot.hostname().value());
         object.setString(STATE_FIELD, asString(snapshot.state()));
-        object.setLong(CREATED_AT_FIELD, snapshot.createdAt().toEpochMilli());
         object.setString(INSTANCE_FIELD, snapshot.cluster().application().serializedForm());
         object.setString(CLUSTER_FIELD, snapshot.cluster().cluster().value());
         object.setLong(CLUSTER_INDEX_FIELD, snapshot.clusterIndex());
+        Cursor historyArray = object.setArray(HISTORY_FIELD);
+        snapshot.history().events().values().forEach(event -> {
+            Cursor eventObject = historyArray.addObject();
+            eventObject.setString(EVENT_FIELD, asString(event.type()));
+            eventObject.setLong(AT_FIELD, event.at().toEpochMilli());
+        });
     }
 
     public static String asString(Snapshot.State state) {
         return switch (state) {
             case creating -> "creating";
-            case failed -> "failed";
             case created -> "created";
             case restoring -> "restoring";
-            case restoreFailed -> "restoreFailed";
             case restored -> "restored";
         };
     }
@@ -91,10 +106,8 @@ public static String asString(Snapshot.State state) {
     private static Snapshot.State stateFromSlime(String value) {
         return switch (value) {
             case "creating" -> Snapshot.State.creating;
-            case "failed" -> Snapshot.State.failed;
             case "created" -> Snapshot.State.created;
             case "restoring" -> Snapshot.State.restoring;
-            case "restoreFailed" -> Snapshot.State.restoreFailed;
             case "restored" -> Snapshot.State.restored;
             default -> throw new IllegalArgumentException("Unknown snapshot state '" + value + "'");
         };
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
index 23a3696a5a62..10095e20083a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -246,7 +246,7 @@ static void toSlime(WireguardKeyWithTimestamp keyWithTimestamp, Cursor object) {
     }
 
     private void toSlime(Snapshot snapshot, Cursor object) {
-        object.setString("id", snapshot.id());
+        object.setString("id", snapshot.id().toString());
         object.setString("state", SnapshotSerializer.asString(snapshot.state()));
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
index 8561c7e5b967..342e1e4ec7e4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
@@ -37,6 +37,7 @@
 import com.yahoo.vespa.hosted.provision.applications.Application;
 import com.yahoo.vespa.hosted.provision.autoscale.Load;
 import com.yahoo.vespa.hosted.provision.backup.Snapshot;
+import com.yahoo.vespa.hosted.provision.backup.SnapshotId;
 import com.yahoo.vespa.hosted.provision.maintenance.InfraApplicationRedeployer;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.IP;
@@ -139,7 +140,7 @@ private HttpResponse handleGET(HttpRequest request) {
         if (path.matches(    "/nodes/v2/wireguard")) return new WireguardResponse(nodeRepository);
         if (path.matches(    "/nodes/v2/snapshot")) return new SnapshotResponse(nodeRepository);
         if (path.matches(    "/nodes/v2/snapshot/{hostname}")) return new SnapshotResponse(nodeRepository, path.get("hostname"));
-        if (path.matches(    "/nodes/v2/snapshot/{hostname}/{snapshotId}")) return new SnapshotResponse(nodeRepository, path.get("hostname"), path.get("snapshotId"));
+        if (path.matches(    "/nodes/v2/snapshot/{hostname}/{snapshotId}")) return new SnapshotResponse(nodeRepository, SnapshotId.of(path.get("snapshotId")), path.get("hostname"));
         throw new NotFoundException("Nothing at " + path);
     }
 
@@ -204,7 +205,7 @@ else if (path.matches("/nodes/v2/upgrade/{nodeType}")) {
             return setTargetVersions(path.get("nodeType"), toSlime(request));
         }
         else if (path.matches("/nodes/v2/snapshot/{hostname}/{snapshot}")) {
-            return updateSnapshot(path.get("hostname"), path.get("snapshot"), toSlime(request));
+            return updateSnapshot(SnapshotId.of(path.get("snapshot")), path.get("hostname"), toSlime(request));
         }
 
         throw new NotFoundException("Nothing at '" + path + "'");
@@ -241,6 +242,7 @@ private HttpResponse handlePOST(HttpRequest request) {
             return new MessageResponse("Triggered dropping of documents on " + count + " nodes");
         }
         if (path.matches("/nodes/v2/snapshot/{hostname}")) return snapshot(path.get("hostname"));
+        if (path.matches("/nodes/v2/snapshot/{hostname}/{snapshot}/restore")) return restoreSnapshot(SnapshotId.of(path.get("snapshot")), path.get("hostname"));
 
         throw new NotFoundException("Nothing at path '" + request.getUri().getPath() + "'");
     }
@@ -250,7 +252,18 @@ private HttpResponse snapshot(String hostname) {
         return new MessageResponse("Triggered a new snapshot of " + hostname + ": " + snapshot.id());
     }
 
-    private HttpResponse updateSnapshot(String hostname, String id, Inspector body) {
+    private HttpResponse restoreSnapshot(SnapshotId id, String hostname) {
+        Snapshot snapshot = nodeRepository.snapshots().restore(id, hostname);
+        return new MessageResponse("Triggered restore of snapshot '" + snapshot.id() + "' to " + hostname);
+    }
+
+    private HttpResponse forgetSnapshot(SnapshotId id, String hostname, HttpRequest request) {
+        boolean force = request.getBooleanProperty("force");
+        nodeRepository.snapshots().remove(id, hostname, force);
+        return new MessageResponse("Removed snapshot '" + id + "' belonging to " + hostname);
+    }
+
+    private HttpResponse updateSnapshot(SnapshotId id, String hostname, Inspector body) {
         Inspector stateField = body.field("state");
         if (!stateField.valid()) {
             throw new IllegalArgumentException("No 'state' field present in request body");
@@ -258,10 +271,8 @@ private HttpResponse updateSnapshot(String hostname, String id, Inspector body)
         String value = stateField.asString();
         Snapshot.State newState = switch (value) {
             case "creating" -> Snapshot.State.creating;
-            case "failed" -> Snapshot.State.failed;
             case "created" -> Snapshot.State.created;
             case "restoring" -> Snapshot.State.restoring;
-            case "restoreFailed" -> Snapshot.State.restoreFailed;
             case "restored" -> Snapshot.State.restored;
             default -> throw new IllegalArgumentException("Invalid snapshot state '" + value + "'");
         };
@@ -275,6 +286,7 @@ private HttpResponse handleDELETE(HttpRequest request) {
         if (path.matches("/nodes/v2/archive/account/{key}") || path.matches("/nodes/v2/archive/tenant/{key}"))
             return setArchiveUri(path.get("key"), Optional.empty(), !path.getPath().segments().get(3).equals("account"));
         if (path.matches("/nodes/v2/upgrade/firmware")) return cancelFirmwareCheckResponse();
+        if (path.matches("/nodes/v2/snapshot/{hostname}/{snapshot}")) return forgetSnapshot(SnapshotId.of(path.get("snapshot")), path.get("hostname"), request);
 
         throw new NotFoundException("Nothing at path '" + request.getUri().getPath() + "'");
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/SnapshotResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/SnapshotResponse.java
index 6d0c434385cf..75cfbb2a8d81 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/SnapshotResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/SnapshotResponse.java
@@ -5,8 +5,10 @@
 import com.yahoo.slime.Cursor;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.backup.Snapshot;
+import com.yahoo.vespa.hosted.provision.backup.SnapshotId;
 import com.yahoo.vespa.hosted.provision.persistence.SnapshotSerializer;
 
+import java.time.Instant;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
@@ -24,17 +26,17 @@ public SnapshotResponse(NodeRepository nodeRepository, String hostname) {
         this(nodeRepository, Optional.of(hostname), Optional.empty());
     }
 
-    public SnapshotResponse(NodeRepository nodeRepository, String hostname, String snapshotId) {
+    public SnapshotResponse(NodeRepository nodeRepository, SnapshotId snapshotId, String hostname) {
         this(nodeRepository, Optional.of(hostname), Optional.of(snapshotId));
     }
 
-    private SnapshotResponse(NodeRepository nodeRepository, Optional<String> hostname, Optional<String> snapshotId) {
-        if (snapshotId.isPresent() && hostname.isEmpty()) {
+    private SnapshotResponse(NodeRepository nodeRepository, Optional<String> hostname, Optional<SnapshotId> id) {
+        if (id.isPresent() && hostname.isEmpty()) {
             throw new IllegalArgumentException("Must specify hostname when snapshotId is given");
         }
         Cursor root = slime.setObject();
-        if (snapshotId.isPresent()) {
-            SnapshotSerializer.toSlime(nodeRepository.snapshots().require(snapshotId.get(), hostname.get()), root);
+        if (id.isPresent()) {
+            SnapshotSerializer.toSlime(nodeRepository.snapshots().require(id.get(), hostname.get()), root);
         } else {
             final List<Snapshot> snapshots;
             if (hostname.isPresent()) {
@@ -45,7 +47,9 @@ private SnapshotResponse(NodeRepository nodeRepository, Optional<String> hostnam
             Cursor snapshotsArray = root.setArray("snapshots");
             snapshots.stream()
                      .sorted(Comparator.comparing(Snapshot::hostname)
-                                       .thenComparing(Snapshot::createdAt))
+                                       .thenComparing(snapshot -> snapshot.history().event(Snapshot.State.creating)
+                                                                          .map(Snapshot.History.Event::at)
+                                                                          .orElse(Instant.EPOCH)))
                      .forEach(snapshot -> SnapshotSerializer.toSlime(snapshot, snapshotsArray.addObject()));
         }
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/backup/SnapshotTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/backup/SnapshotTest.java
new file mode 100644
index 000000000000..cead61902733
--- /dev/null
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/backup/SnapshotTest.java
@@ -0,0 +1,53 @@
+package com.yahoo.vespa.hosted.provision.backup;
+
+import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.HostName;
+import com.yahoo.vespa.hosted.provision.node.ClusterId;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
+
+
+/**
+ * @author mpolden
+ */
+class SnapshotTest {
+
+    @Test
+    void state_changes() {
+        assertAllowed(Snapshot.State.creating, Snapshot.State.created);
+        assertAllowed(Snapshot.State.created, Snapshot.State.restoring);
+        assertAllowed(Snapshot.State.restoring, Snapshot.State.restored);
+        assertAllowed(Snapshot.State.restored, Snapshot.State.restoring);
+
+        assertDisallowed(Snapshot.State.created, Snapshot.State.creating);
+        assertDisallowed(Snapshot.State.creating, Snapshot.State.restoring);
+        assertDisallowed(Snapshot.State.creating, Snapshot.State.restored);
+        assertDisallowed(Snapshot.State.restored, Snapshot.State.created);
+        assertDisallowed(Snapshot.State.restored, Snapshot.State.created);
+    }
+
+    private static void assertAllowed(Snapshot.State from, Snapshot.State to) {
+        Snapshot snapshot = snapshot(from);
+        assertSame(to, snapshot.with(to, Instant.ofEpochMilli(123)).state());
+    }
+
+    private static void assertDisallowed(Snapshot.State from, Snapshot.State to) {
+        Snapshot snapshot = snapshot(from);
+        try {
+            snapshot.with(to, Instant.ofEpochMilli(123));
+            fail("Changing state " + from + " -> " + to + " should fail");
+        } catch (IllegalArgumentException ignored) {}
+    }
+
+    private static Snapshot snapshot(Snapshot.State state) {
+        return new Snapshot(Snapshot.generateId(), HostName.of("h1.example.com"), state,
+                            Snapshot.History.of(state, Instant.ofEpochMilli(123)), new ClusterId(ApplicationId.defaultId(), ClusterSpec.Id.from("c1")),
+                            0);
+    }
+
+}
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacerTest.java
index e5fb3d007161..cf5949fed87e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DiskReplacerTest.java
@@ -1,8 +1,12 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.maintenance;
 
-import com.yahoo.config.provision.Cloud;
+import com.yahoo.config.provision.Capacity;
+import com.yahoo.config.provision.ClusterResources;
+import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.NodeResources;
+import com.yahoo.vespa.hosted.provision.Node;
+import com.yahoo.vespa.hosted.provision.backup.Snapshot;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.provisioning.ProvisioningTester;
 import com.yahoo.vespa.hosted.provision.testutils.MockHostProvisioner;
@@ -12,6 +16,8 @@
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author mpolden
@@ -24,21 +30,36 @@ public class DiskReplacerTest {
 
     @Test
     public void rebuild_host() {
-        tester.makeReadyHosts(2, new NodeResources(1, 1, 1, 1, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote)).activateTenantHosts();
+        tester.makeReadyHosts(2, new NodeResources(2, 8, 100, 1, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote))
+              .activateTenantHosts();
+        List<Node> nodes = tester.deploy(ProvisioningTester.applicationId(), ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("c")).vespaVersion("8").build(),
+                                         Capacity.from(new ClusterResources(2, 1, new NodeResources(2, 8, 100, 1))));
 
         // No rebuilds in initial run
         diskReplacer.maintain();
         assertEquals(0, tester.nodeRepository().nodes().list().rebuilding(true).size());
 
         // Host starts rebuilding
-        tester.nodeRepository().nodes().rebuild("host-1.yahoo.com", true, Agent.RebuildingOsUpgrader,
-                tester.nodeRepository().clock().instant());
+        String host0 = "host-1.yahoo.com";
+        tester.nodeRepository().nodes().rebuild(host0, true, Agent.RebuildingOsUpgrader,
+                                                tester.nodeRepository().clock().instant());
         diskReplacer.maintain();
         assertEquals(1, tester.nodeRepository().nodes().list().rebuilding(true).size());
 
+        // Host creates a snapshot of its children
+        nodes.forEach(node -> {
+            Snapshot snapshot = tester.nodeRepository().snapshots().create(node.hostname(), tester.clock().instant());
+            tester.nodeRepository().snapshots().move(snapshot.id(), node.hostname(), Snapshot.State.created);
+        });
+
         // Rebuild completes
-        hostProvisioner.completeRebuildOf("host-1.yahoo.com");
+        hostProvisioner.completeRebuildOf(host0);
         diskReplacer.maintain();
+        nodes = tester.nodeRepository().nodes().list().childrenOf(host0).asList();
+        assertFalse(nodes.isEmpty());
+        assertTrue(nodes.stream().allMatch(node -> node.status().snapshot().isPresent() &&
+                                                   node.status().snapshot().get().state() == Snapshot.State.restoring), "Snapshot restore is triggered for all children");
         assertEquals(0, tester.nodeRepository().nodes().list().rebuilding(true).size());
     }
+
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SnapshotSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SnapshotSerializerTest.java
index 19115019d822..1c2c84107da5 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SnapshotSerializerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SnapshotSerializerTest.java
@@ -4,13 +4,14 @@
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.hosted.provision.backup.Snapshot;
+import com.yahoo.vespa.hosted.provision.backup.SnapshotId;
 import com.yahoo.vespa.hosted.provision.node.ClusterId;
 import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author mpolden
@@ -19,20 +20,23 @@ class SnapshotSerializerTest {
 
     @Test
     void serialization() {
-        Snapshot snapshot0 = new Snapshot("id0",
+        Snapshot snapshot0 = new Snapshot(SnapshotId.of("ccf0b6de-3e06-4045-acba-458d99ef73e5"),
                                           HostName.of("host0.example.com"),
                                           Snapshot.State.creating,
-                                          Instant.ofEpochMilli(123),
+                                          Snapshot.History.of(Snapshot.State.creating, Instant.ofEpochMilli(123)),
                                           new ClusterId(ApplicationId.from("t1", "a1", "i1"),
                                                         ClusterSpec.Id.from("c1")),
-                                          1);
-        Snapshot snapshot1 = new Snapshot("id1",
+                                          0
+        );
+        Snapshot snapshot1 = new Snapshot(SnapshotId.of("7e45b44a-0f1a-4729-a4f4-20fff5d1e85d"),
                                           HostName.of("host1.example.com"),
                                           Snapshot.State.restored,
-                                          Instant.ofEpochMilli(456),
+                                          Snapshot.History.of(Snapshot.State.restoring, Instant.ofEpochMilli(123))
+                                                          .with(Snapshot.State.restored, Instant.ofEpochMilli(456)),
                                           new ClusterId(ApplicationId.from("t2", "a2", "i2"),
                                                         ClusterSpec.Id.from("c2")),
-                                          2);
+                                          2
+        );
         assertEquals(snapshot0, SnapshotSerializer.fromSlime(SnapshotSerializer.toSlime(snapshot0)));
         List<Snapshot> snapshots = List.of(snapshot0, snapshot1);
         assertEquals(snapshots, SnapshotSerializer.listFromSlime(SnapshotSerializer.toSlime(snapshots)));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
index a9799a9880da..c73490fbe060 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
@@ -868,6 +868,9 @@ public void test_snapshots() throws IOException {
         tester.assertResponseContains(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com",
                                                   new byte[0], Request.Method.POST),
                                       "{\"message\":\"Triggered a new snapshot of host4.yahoo.com:");
+        tester.assertResponseContains(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com",
+                                                  new byte[0], Request.Method.POST),
+                                      "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Cannot trigger new snapshot: Node host4.yahoo.com is busy with snapshot");
         tester.assertResponseContains(new Request("http://localhost:8080/nodes/v2/snapshot/host2.yahoo.com",
                                                   new byte[0], Request.Method.POST),
                                       "{\"message\":\"Triggered a new snapshot of host2.yahoo.com:");
@@ -876,23 +879,80 @@ public void test_snapshots() throws IOException {
         String listResponse = tester.container()
                                     .handleRequest(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com"))
                                     .getBodyAsString();
-        String id = SlimeUtils.entriesStream(SlimeUtils.jsonToSlime(listResponse).get().field("snapshots"))
-                              .findFirst().get()
-                              .field("id").asString();
+        String id0 = SlimeUtils.entriesStream(SlimeUtils.jsonToSlime(listResponse).get().field("snapshots"))
+                               .findFirst().get()
+                               .field("id").asString();
         assertFile(new Request("http://localhost:8080/nodes/v2/snapshot"), "snapshot/list.json");
         assertFile(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com"), "snapshot/list-host.json");
-        assertFile(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id), "snapshot/single.json");
+        assertFile(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id0), "snapshot/single.json");
 
         // Update snapshot state
-        tester.assertResponse(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id,
+        tester.assertResponse(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id0,
                                           """
                                                   {"state": "created"}
                                                   """,
                                           Request.Method.PATCH),
-                              "{\"message\":\"Updated snapshot '" + id + "' for node host4.yahoo.com\"}");
+                              "{\"message\":\"Updated snapshot '" + id0 + "' for node host4.yahoo.com\"}");
+
+        // List snapshots
+        assertFile(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com"), "snapshot/list-host-updated.json");
 
         // Get node
         tester.assertFile(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com"), "snapshot/node4.json");
+
+        // Trigger another snapshot
+        tester.assertResponseContains(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com",
+                                                  new byte[0], Request.Method.POST),
+                                      "{\"message\":\"Triggered a new snapshot of host4.yahoo.com:");
+        listResponse = tester.container()
+                                    .handleRequest(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com"))
+                                    .getBodyAsString();
+        String id1 = SlimeUtils.entriesStream(SlimeUtils.jsonToSlime(listResponse).get().field("snapshots"))
+                               .toList().get(1).field("id").asString();
+
+        // Cannot trigger restore while busy with a different snapshot
+        tester.assertResponse(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id0 + "/restore",
+                                          new byte[0],
+                                          Request.Method.POST),
+                              400,
+                              "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Cannot restore snapshot: Node host4.yahoo.com is busy with snapshot " + id1 + " in creating state\"}");
+
+        // Cannot change state of a non-active snapshot
+        tester.assertResponse(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id0,
+                                          """
+                                                  {"state": "restored"}
+                                                  """,
+                                          Request.Method.PATCH),
+                              400,
+                              "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Cannot move snapshot " + id0 + " to restored: Node host4.yahoo.com is not working on this snapshot\"}");
+
+        // Snapshot completes
+        tester.assertResponse(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id1,
+                                          """
+                                                  {"state": "created"}
+                                                  """,
+                                          Request.Method.PATCH),
+                              "{\"message\":\"Updated snapshot '" + id1 + "' for node host4.yahoo.com\"}");
+
+        // Start restore of snapshot
+        tester.assertResponse(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id1 + "/restore",
+                                          new byte[0],
+                                          Request.Method.POST),
+                              200,
+                              "{\"message\":\"Triggered restore of snapshot '" + id1 + "' to host4.yahoo.com\"}");
+
+        // Forget about snapshot
+        assertResponse(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id0, new byte[0], Request.Method.DELETE),
+                       "{\"message\":\"Removed snapshot '" + id0 + "' belonging to host4.yahoo.com\"}");
+
+        // Forgetting about active snapshot fails
+        tester.assertResponse(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id1, new byte[0], Request.Method.DELETE),
+                              400,
+                              "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Cannot remove snapshot " + id1 + ": Node host4.yahoo.com is working on this snapshot\"}");
+        // ..., but succeeds with force
+        tester.assertResponse(new Request("http://localhost:8080/nodes/v2/snapshot/host4.yahoo.com/" + id1 + "?force=true", new byte[0], Request.Method.DELETE),
+                              200,
+                              "{\"message\":\"Removed snapshot '" + id1 + "' belonging to host4.yahoo.com\"}");
     }
 
     @Test
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list-host-updated.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list-host-updated.json
new file mode 100644
index 000000000000..16edbc7b26cf
--- /dev/null
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list-host-updated.json
@@ -0,0 +1,22 @@
+{
+  "snapshots": [
+    {
+      "cluster": "id3",
+      "clusterIndex": 0,
+      "hostname": "host4.yahoo.com",
+      "id": "(ignore)",
+      "instance": "tenant3:application3:instance3",
+      "state": "created",
+      "history": [
+        {
+          "at": 123,
+          "event": "creating"
+        },
+        {
+          "at": 123,
+          "event": "created"
+        }
+      ]
+    }
+  ]
+}
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list-host.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list-host.json
index ef099aaa29fa..733938bee306 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list-host.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list-host.json
@@ -3,11 +3,16 @@
     {
       "cluster": "id3",
       "clusterIndex": 0,
-      "createdAt": 123,
       "hostname": "host4.yahoo.com",
       "id": "(ignore)",
       "instance": "tenant3:application3:instance3",
-      "state": "creating"
+      "state": "creating",
+      "history": [
+        {
+          "at": 123,
+          "event": "creating"
+        }
+      ]
     }
   ]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list.json
index 489278b05860..fb20a70534c3 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/list.json
@@ -3,20 +3,30 @@
     {
       "cluster": "id2",
       "clusterIndex": 0,
-      "createdAt": 123,
       "hostname": "host2.yahoo.com",
       "id": "(ignore)",
       "instance": "tenant2:application2:instance2",
-      "state": "creating"
+      "state": "creating",
+      "history": [
+        {
+          "at": 123,
+          "event": "creating"
+        }
+      ]
     },
     {
       "cluster": "id3",
       "clusterIndex": 0,
-      "createdAt": 123,
       "hostname": "host4.yahoo.com",
       "id": "(ignore)",
       "instance": "tenant3:application3:instance3",
-      "state": "creating"
+      "state": "creating",
+      "history": [
+        {
+          "at": 123,
+          "event": "creating"
+        }
+      ]
     }
   ]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/single.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/single.json
index 031b76fb2e1e..e9064dc25384 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/single.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/snapshot/single.json
@@ -1,9 +1,14 @@
 {
   "cluster": "id3",
   "clusterIndex": 0,
-  "createdAt": 123,
   "hostname": "host4.yahoo.com",
   "id": "(ignore)",
   "instance": "tenant3:application3:instance3",
-  "state": "creating"
+  "state": "creating",
+  "history": [
+    {
+      "at": 123,
+      "event": "creating"
+    }
+  ]
 }
diff --git a/screwdriver/delete-old-cloudsmith-artifacts.sh b/screwdriver/delete-old-cloudsmith-artifacts.sh
deleted file mode 100755
index bf1265706ef5..000000000000
--- a/screwdriver/delete-old-cloudsmith-artifacts.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-set -euo pipefail
-MAX_NUMBER_OF_RELEASES=40
-
-# Cloudsmith repo
-rpm --import 'https://dl.cloudsmith.io/public/vespa/open-source-rpms/gpg.0F3DA3C70D35DA7B.key'
-curl -1sLf 'https://dl.cloudsmith.io/public/vespa/open-source-rpms/config.rpm.txt?distro=el&codename=8' > /tmp/vespa-open-source-rpms.repo
-dnf config-manager --add-repo '/tmp/vespa-open-source-rpms.repo'
-rm -f /tmp/vespa-open-source-rpms.repo
-
-# Allow the last Vespa 7 release to remain in the repo
-VERSIONS_TO_DELETE=$(dnf list -y --quiet --showduplicates --disablerepo='*' --enablerepo=vespa-open-source-rpms vespa | awk '/[0-9].*\.[0-9].*\.[0-9].*/{print $2}' | sort -V | grep -v "7.594.36" | head -n -$MAX_NUMBER_OF_RELEASES)
-
-if [[ -z "$VERSIONS_TO_DELETE" ]]; then
-  echo "No old RPM versions to delete found. Exiting."
-  exit 0
-fi
-
-RPMS_TO_DELETE=$(mktemp)
-trap "rm -f $RPMS_TO_DELETE" EXIT
-
-for VERSION in $VERSIONS_TO_DELETE; do
-  curl -sLf --header 'accept: application/json' \
-    "https://api.cloudsmith.io/v1/packages/vespa/open-source-rpms/?query=version:${VERSION}" | jq -re '.[] | .slug' >> $RPMS_TO_DELETE
-done
-
-echo "Deleting the following RPMs:"
-cat $RPMS_TO_DELETE
-
-if [[ -n $SCREWDRIVER ]] && [[ -z $SD_PULL_REQUEST ]]; then
-    for RPMID in $(cat $RPMS_TO_DELETE); do
-      curl -sLf -X DELETE \
-        --header "X-Api-Key: $CLOUDSMITH_API_TOKEN" \
-        --header 'accept: application/json' \
-        "https://api.cloudsmith.io/v1/packages/vespa/open-source-rpms/$RPMID/"
-    done
-fi
-
-
diff --git a/screwdriver/publish-unpublished-rpms-to-archive.sh b/screwdriver/publish-unpublished-rpms-to-archive.sh
deleted file mode 100755
index e3e2b7b1c021..000000000000
--- a/screwdriver/publish-unpublished-rpms-to-archive.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-set -euo pipefail
-set -x
-
-if (( $# < 1 )); then
-    echo "Usage: $0 <RPM architecture>"
-    exit 1
-fi
-
-RPMARCH=$1
-ALLOWED_ARCHS=("x86_64" "aarch64")
-
-if [[ ! ${ALLOWED_ARCHS[@]} =~ $RPMARCH ]]; then
-  echo "Architecture $RPMARCH not in allowed archs: ${ALLOWED_ARCHS[@]}"
-  exit 1
-fi
-
-readonly MYDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Copr repo
-dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-8/group_vespa-vespa-epel-8.repo
-sed -i "s,\$basearch,$RPMARCH,g" /etc/yum.repos.d/group_vespa-vespa-epel-8.repo
-
-# Cloudsmith repo
-rpm --import 'https://dl.cloudsmith.io/public/vespa/open-source-rpms/gpg.0F3DA3C70D35DA7B.key'
-curl -1sLf 'https://dl.cloudsmith.io/public/vespa/open-source-rpms/config.rpm.txt?distro=el&codename=8' > /tmp/vespa-open-source-rpms.repo
-dnf config-manager --add-repo '/tmp/vespa-open-source-rpms.repo'
-rm -f /tmp/vespa-open-source-rpms.repo
-
-readonly COPR_PACKAGES=$(mktemp)
-trap "rm -f $COPR_PACKAGES" EXIT
-readonly DLDIR=$(mktemp -d)
-trap "rm -rf $DLDIR" EXIT
-
-cd $DLDIR
-
-readonly DNF="dnf -y -q --forcearch $RPMARCH"
-
-$DNF list --disablerepo='*' --enablerepo=copr:copr.fedorainfracloud.org:group_vespa:vespa --showduplicates 'vespa*' | grep "Available Packages" -A 100000 | tail -n +2 | sed '/\.src\ */d' | sed -E "s/\.($RPMARCH|noarch)\ */-/" | awk '{print $1}' | grep -v '.src$' > $COPR_PACKAGES
-
-echo "Packages on Copr:"
-cat $COPR_PACKAGES
-echo
-
-for pv in $(cat $COPR_PACKAGES); do
-  if ! $DNF list --disablerepo='*' --enablerepo=vespa-open-source-rpms $pv &> /dev/null; then
-    # Need one extra check here for noarch packages
-    if ! dnf -y -q --forcearch noarch list --disablerepo='*' --enablerepo=vespa-open-source-rpms $pv &> /dev/null; then
-      echo "$pv not found on in archive. Downloading..."
-      $DNF download --disablerepo='*' --enablerepo=copr:copr.fedorainfracloud.org:group_vespa:vespa $pv
-      echo "$pv downloaded."
-    fi
-  fi
-done
-echo
-
-if ! ls *.rpm &> /dev/null; then
-  echo "All packages already in archive."
-  exit 0
-fi
-
-echo "RPMs missing in archive:"
-ls -lh  *.rpm
-echo
-
-UPLOAD_FAILED=false
-if [[ -n $SCREWDRIVER ]] && [[ -z $SD_PULL_REQUEST ]]; then
-  for rpm in $(ls *.rpm); do
-    echo "Uploading $rpm ..."
-    if ! $MYDIR/upload-rpm-to-cloudsmith.sh $rpm ; then
-      echo "Could not upload $rpm"
-      UPLOAD_FAILED=true
-    else
-      echo "$rpm uploaded"
-    fi
-  done
-  echo
-fi
-
-if $UPLOAD_FAILED; then
-  echo "Some RPMs failed to upload"
-  exit 1
-fi
diff --git a/screwdriver/release-java-artifacts.sh b/screwdriver/release-java-artifacts.sh
deleted file mode 100755
index 21ed793561c4..000000000000
--- a/screwdriver/release-java-artifacts.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-set -euo pipefail
-
-if [[ $# -ne 1 ]]; then
-    echo "Usage: $0 <Vespa release version>"
-    exit 1
-fi
-
-if [[ -z $OSSRH_USER ]] || [[ -z $OSSRH_TOKEN ]]  || [[ -z $GPG_KEYNAME ]] || [[ -z $GPG_PASSPHRASE_TOKEN ]] || [[ -z $GPG_ENCPHRASE_TOKEN ]]; then
-    echo -e "The follwing env variables must be set:\n OSSRH_USER\n OSSRH_TOKEN\n GPG_KEYNAME\n GPG_PASSPHRASE_TOKEN\n GPG_ENCPHRASE_TOKEN"
-    exit 1
-fi
-
-readonly VESPA_RELEASE="$1"
-
-QUERY_VERSION_HTTP_CODE=$(curl --write-out %{http_code} --silent --location --output /dev/null https://oss.sonatype.org/content/repositories/releases/com/yahoo/vespa/parent/${VESPA_RELEASE}/parent-${VESPA_RELEASE}.pom)
-if [[ "200" == $QUERY_VERSION_HTTP_CODE ]]; then
-  echo "Vespa version $VESPA_RELEASE is already promoted, exiting"
-  exit 0
-fi
-
-export SOURCE_DIR=$(pwd)
-
-mkdir -p $SOURCE_DIR/screwdriver/deploy
-# gpg-agent in RHEL 8 runs out of memory if we use Maven and sign in parallel. Add option to overcome this.
-echo "auto-expand-secmem" >> $SOURCE_DIR/screwdriver/deploy/gpg-agent.conf
-openssl aes-256-cbc -md md5 -pass pass:$GPG_ENCPHRASE_TOKEN -in $SOURCE_DIR/screwdriver/pubring.gpg.enc -out $SOURCE_DIR/screwdriver/deploy/pubring.gpg -d
-openssl aes-256-cbc -md md5 -pass pass:$GPG_ENCPHRASE_TOKEN -in $SOURCE_DIR/screwdriver/secring.gpg.enc -out $SOURCE_DIR/screwdriver/deploy/secring.gpg -d
-chmod 700 $SOURCE_DIR/screwdriver/deploy
-chmod 600 $SOURCE_DIR/screwdriver/deploy/*
-trap "rm -rf $SOURCE_DIR/screwdriver/deploy" EXIT
-
-# Number of parallel uploads
-NUM_PROC=10
-
-export MVN=${MVN:-mvn}
-export MVN_OPTS=${MVN_OPTS:-}
-export MAVEN_GPG_PASSPHRASE=$GPG_PASSPHRASE_TOKEN
-
-export TMP_STAGING=$(mktemp -d)
-mkdir -p $TMP_STAGING
-trap "rm -rf $TMP_STAGING" EXIT
-
-sign_module() {
-    ECHO=""
-
-    P=$1
-    V=$(basename $P)
-    A=$(basename $(dirname $P))
-    G=$(dirname $(dirname $P) | sed 's,/,.,g')
-    POM="$P/$A-$V.pom"
-    JAR="$P/$A-$V.jar"
-    if [[ -f $JAR ]]; then
-        FILE_OPTS="-Dfile=$JAR -Dpackaging=jar"
-    else
-        FILE_OPTS="-Dfile=$POM -Dpackaging=pom"
-    fi
-
-    AFILES=()
-    ATYPES=()
-    ACLASSIFIERS=()
-    for EX in $(find $P \( -name "$A-$V-*.jar" -or -name "$A-$V-*.zip" \) ); do
-        AFILES+=($EX)
-        EXB=$(basename $EX)
-        EXT=${EXB##*.}
-        ATYPES+=($EXT)
-        EXF=${EXB%.*}
-        EXC=$(echo $EXF|sed "s,$A-$V-,,")
-        ACLASSIFIERS+=($EXC)
-    done
-
-    if (( ${#AFILES[@]} > 0 )); then
-        EXTRA_FILES_OPTS="-Dfiles=$(echo ${AFILES[@]} | sed 's/\ /,/g') -Dtypes=$(echo ${ATYPES[@]} | sed 's/\ /,/g') -Dclassifiers=$(echo ${ACLASSIFIERS[@]} | sed 's/\ /,/g')"
-    fi
-
-    $ECHO $MVN --settings=$SOURCE_DIR/screwdriver/settings-publish.xml \
-          $MVN_OPTS gpg:sign-and-deploy-file \
-          -Durl=file://$TMP_STAGING \
-          -DrepositoryId=maven-central \
-          -DgroupId=$G \
-          -DartifactId=$A \
-          -Dversion=$V \
-          -DpomFile=$POM \
-          -DgeneratePom=false \
-          $FILE_OPTS \
-          $EXTRA_FILES_OPTS
-
-}
-export -f sign_module
-
-aws s3 cp  s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/amd64/maven-repo.tar .
-aws s3 cp  s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/amd64/maven-repo.tar.pem .
-aws s3 cp  s3://381492154096-build-artifacts/vespa-engine--vespa/$VESPA_RELEASE/artifacts/amd64/maven-repo.tar.sig .
-cosign verify-blob --certificate-identity https://buildkite.com/vespaai/vespa-engine-vespa --certificate-oidc-issuer https://agent.buildkite.com --signature maven-repo.tar.sig --certificate maven-repo.tar.pem maven-repo.tar
-rm -rf maven-repo
-tar xvf maven-repo.tar
-REPO_ROOT=$(pwd)/maven-repo
-
-cd $REPO_ROOT
-find . -name "$VESPA_RELEASE" -type d | sed 's,^./,,' | xargs -n 1 -P $NUM_PROC -I '{}' bash -c "sign_module {}"
-
-# Required for the nexus plugin to work with JDK 17
-export MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED"
-
-LOGFILE=$(mktemp)
-$MVN $MVN_OPTS --settings=$SOURCE_DIR/screwdriver/settings-publish.xml \
-    org.sonatype.plugins:nexus-staging-maven-plugin:1.6.14:deploy-staged-repository \
-    -DrepositoryDirectory=$TMP_STAGING \
-    -DnexusUrl=https://oss.sonatype.org \
-    -DserverId=ossrh \
-    -DautoReleaseAfterClose=false \
-    -DstagingProgressTimeoutMinutes=10 \
-    -DstagingProfileId=407c0c3e1a197 | tee $LOGFILE
-
-STG_REPO=$(cat $LOGFILE | grep 'Staging repository at http' | head -1 | awk -F/ '{print $NF}')
-$MVN $MVN_OPTS --settings=$SOURCE_DIR/screwdriver/settings-publish.xml -N \
-    org.sonatype.plugins:nexus-staging-maven-plugin:1.6.14:rc-release \
-    -DnexusUrl=https://oss.sonatype.org/ \
-    -DserverId=ossrh \
-    -DstagingProgressTimeoutMinutes=10 \
-    -DstagingRepositoryId=$STG_REPO
-
diff --git a/screwdriver/upload-rpm-to-artifactory.sh b/screwdriver/upload-rpm-to-artifactory.sh
deleted file mode 100755
index 0da46355a964..000000000000
--- a/screwdriver/upload-rpm-to-artifactory.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-set -euo pipefail
-
-RPM=$1
-OS_DISTRO=centos
-RELEASEVER=8
-MATURITY=release
-BASEARCH=x86_64
-
-main() {
-  if [[ -z $JFROG_API_TOKEN ]] || [[ -z $RPM ]]; then
-      echo "Usage: $0 <RPM package>."
-      echo "Environment variable JFROG_API_TOKEN must be set in environment."
-      exit 1
-  fi
-
-  curl -vLf -H "Authorization: Bearer $JFROG_API_TOKEN" \
-            -H "X-Checksum-Sha1: $(sha1sum $RPM | awk '{print $1}')" \
-            -H "X-Checksum-Sha256: $(sha256sum $RPM | awk '{print $1}')" \
-            -H "X-Checksum-MD5: $(md5sum $RPM | awk '{print $1}')" \
-            -X PUT "https://artifactory.yahooinc.com/artifactory/vespa/$OS_DISTRO/$RELEASEVER/$MATURITY/$BASEARCH/Packages/$RPM" \
-            -T $RPM
-}
-
-main "$@"
diff --git a/screwdriver/upload-rpm-to-cloudsmith.sh b/screwdriver/upload-rpm-to-cloudsmith.sh
deleted file mode 100755
index b20bf033373c..000000000000
--- a/screwdriver/upload-rpm-to-cloudsmith.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-set -euo pipefail
-
-if (( $# < 1 )); then
-  echo "Usage: $0 <RPM file>"
-  exit 1
-fi
-
-if [[ -z $CLOUDSMITH_API_TOKEN ]]; then
-  echo "Environment CLOUDSMITH_API_TOKEN not set. Exiting."
-  exit 1
-fi
-
-RPM=$1
-OS_DISTRO=el
-RELEASEVER=8
-
-main() {
-
-  FID=$(curl -sLf \
-    --upload-file $RPM \
-    -H "X-Api-Key: $CLOUDSMITH_API_TOKEN" \
-    -H "Content-Sha256: $(sha256sum $RPM | cut -f1 -d' ')" \
-    https://upload.cloudsmith.io/vespa/open-source-rpms/$RPM | jq -re '.identifier')
-
-  if [[ -n $FID ]]; then
-    curl -sLf -X POST -H "Content-Type: application/json" \
-      -H "X-Api-Key: $CLOUDSMITH_API_TOKEN" \
-      -d "{\"package_file\": \"$FID\", \"distribution\": \"$OS_DISTRO/$RELEASEVER\"}" \
-      https://api-prd.cloudsmith.io/v1/packages/vespa/open-source-rpms/upload/rpm/
-  fi
-}
-
-main "$@"
diff --git a/searchcore/src/tests/index/disk_indexes/disk_indexes_test.cpp b/searchcore/src/tests/index/disk_indexes/disk_indexes_test.cpp
index 7b9e6ce77bd0..41f821b7d16e 100644
--- a/searchcore/src/tests/index/disk_indexes/disk_indexes_test.cpp
+++ b/searchcore/src/tests/index/disk_indexes/disk_indexes_test.cpp
@@ -24,7 +24,9 @@ class DiskIndexesTest : public ::testing::Test,
     IndexDiskLayout _layout;
 protected:
     DiskIndexesTest();
-    ~DiskIndexesTest();
+    ~DiskIndexesTest() override;
+    static void SetUpTestSuite();
+    static void TearDownTestSuite();
 
     static IndexDiskDir get_index_disk_dir(const std::string& dir) {
         return IndexDiskLayout::get_index_disk_dir(dir);
@@ -44,6 +46,18 @@ DiskIndexesTest::DiskIndexesTest()
 
 DiskIndexesTest::~DiskIndexesTest() = default;
 
+void
+DiskIndexesTest::SetUpTestSuite()
+{
+    std::filesystem::remove_all(std::filesystem::path(base_dir));
+}
+
+void
+DiskIndexesTest::TearDownTestSuite()
+{
+    std::filesystem::remove_all(std::filesystem::path(base_dir));
+}
+
 TEST_F(DiskIndexesTest, simple_set_active_works)
 {
     EXPECT_FALSE(isActive("index.flush.1"));
@@ -185,12 +199,4 @@ TEST_F(DiskIndexesTest, get_transient_size_during_ongoing_fusion)
 
 }
 
-int
-main(int argc, char* argv[])
-{
-    std::filesystem::remove_all(std::filesystem::path(base_dir));
-    ::testing::InitGoogleTest(&argc, argv);
-    auto result = RUN_ALL_TESTS();
-    std::filesystem::remove_all(std::filesystem::path(base_dir));
-    return result;
-}
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchcore/src/tests/proton/common/CMakeLists.txt b/searchcore/src/tests/proton/common/CMakeLists.txt
index 07b12115abd4..5e8500427783 100644
--- a/searchcore/src/tests/proton/common/CMakeLists.txt
+++ b/searchcore/src/tests/proton/common/CMakeLists.txt
@@ -2,7 +2,6 @@
 vespa_add_executable(searchcore_proton_common_vespa_test_app TEST
     SOURCES
     vespa_testrunner.cpp
-    feedoperation_test.cpp
     index_writer_test.cpp
     job_load_sampler_test.cpp
     job_tracked_flush_test.cpp
@@ -13,7 +12,6 @@ vespa_add_executable(searchcore_proton_common_vespa_test_app TEST
     selectpruner_test.cpp
     DEPENDS
     searchcore_proton_metrics
-    searchcore_feedoperation
     searchcore_pcommon
     searchcore_test
     searchlib_test
@@ -28,9 +26,11 @@ vespa_add_executable(searchcore_proton_common_gtest_test_app TEST
     cachedselect_test.cpp
     document_type_inspector_test.cpp
     documentdb_job_trackers_test.cpp
+    feedoperation_test.cpp
     metrics_engine_test.cpp
     proton_disk_layout_test.cpp
     DEPENDS
+    searchcore_feedoperation
     searchcore_pcommon
     searchcore_test
     searchlib_test
diff --git a/searchcore/src/tests/proton/common/feedoperation_test.cpp b/searchcore/src/tests/proton/common/feedoperation_test.cpp
index 4341113dc710..c5e99df9e7ab 100644
--- a/searchcore/src/tests/proton/common/feedoperation_test.cpp
+++ b/searchcore/src/tests/proton/common/feedoperation_test.cpp
@@ -24,8 +24,7 @@
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/datatype/documenttype.h>
-#include <vespa/vespalib/testkit/test_kit.h>
-#include <vespa/vespalib/testkit/test_master.hpp>
+#include <vespa/vespalib/gtest/gtest.h>
 
 using document::BucketId;
 using document::DataType;
@@ -85,13 +84,13 @@ uint32_t getDocIdSize(const DocumentId &doc_id)
 
 void assertDocumentOperation(DocumentOperation &op, BucketId expBucket, uint32_t expDocSize)
 {
-    EXPECT_EQUAL(expBucket, op.getBucketId());
-    EXPECT_EQUAL(10u, op.getTimestamp());
-    EXPECT_EQUAL(expDocSize, op.getSerializedDocSize());
-    EXPECT_EQUAL(1u, op.getSubDbId());
-    EXPECT_EQUAL(2u, op.getLid());
-    EXPECT_EQUAL(3u, op.getPrevSubDbId());
-    EXPECT_EQUAL(4u, op.getPrevLid());
+    EXPECT_EQ(expBucket, op.getBucketId());
+    EXPECT_EQ(10u, op.getTimestamp());
+    EXPECT_EQ(expDocSize, op.getSerializedDocSize());
+    EXPECT_EQ(1u, op.getSubDbId());
+    EXPECT_EQ(2u, op.getLid());
+    EXPECT_EQ(3u, op.getPrevSubDbId());
+    EXPECT_EQ(4u, op.getPrevLid());
 }
 
 std::unique_ptr<const DocumentTypeRepo>
@@ -101,9 +100,10 @@ makeDocTypeRepo()
     builder.document(doc_type_id, type_name,
                      Struct(header_name),
                      Struct(body_name)
-                             .addField("string", DataType::T_STRING)
-                             .addField("struct", Struct("pair").addField("x", DataType::T_STRING).addField("y", DataType::T_STRING))
-                             .addField("map", Map(DataType::T_STRING, DataType::T_STRING)));
+                     .addField("string", DataType::T_STRING)
+                     .addField("struct",
+                               Struct("pair").addField("x", DataType::T_STRING).addField("y", DataType::T_STRING))
+                     .addField("map", Map(DataType::T_STRING, DataType::T_STRING)));
     return std::make_unique<const DocumentTypeRepo>(builder.config());
 }
 
@@ -133,7 +133,7 @@ struct Fixture
     }
 };
 
-TEST("require that toString() on derived classes are meaningful")
+TEST(FeedOperationTest, require_that_toString_on_derived_classes_are_meaningful)
 {
     DocumentTypeRepo repo;
     BucketId bucket_id1(42);
@@ -148,102 +148,103 @@ TEST("require that toString() on derived classes are meaningful")
     DocumentId doc_id("id:ns:foo:::bar");
     auto update = std::make_shared<DocumentUpdate>(repo, *DataType::DOCUMENT, doc_id);
 
-    EXPECT_EQUAL("DeleteBucket(BucketId(0x0000000000000000), serialNum=0)",
-                 DeleteBucketOperation().toString());
-    EXPECT_EQUAL("DeleteBucket(BucketId(0x000000000000002a), serialNum=0)",
-                 DeleteBucketOperation(bucket_id1).toString());
-
-    EXPECT_EQUAL("JoinBuckets("
-                 "source1=BucketId(0x0000000000000000), "
-                 "source2=BucketId(0x0000000000000000), "
-                 "target=BucketId(0x0000000000000000), serialNum=0)",
-                 JoinBucketsOperation().toString());
-    EXPECT_EQUAL("JoinBuckets("
-                 "source1=BucketId(0x000000000000002a), "
-                 "source2=BucketId(0x000000000000002b), "
-                 "target=BucketId(0x000000000000002c), serialNum=0)",
-                 JoinBucketsOperation(bucket_id1, bucket_id2, bucket_id3)
-                 .toString());
-
-    EXPECT_EQUAL("Move(NULL, BucketId(0x0000000000000000), timestamp=0, dbdId=(subDbId=0, lid=0), "
-                 "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
-                 MoveOperation().toString());
-    EXPECT_EQUAL("Move(id::::, BucketId(0x000000000000002a), timestamp=10, dbdId=(subDbId=1, lid=0), "
-                 "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
-                 MoveOperation(bucket_id1, timestamp, doc,
-                               db_doc_id, sub_db_id).toString());
-
-    EXPECT_EQUAL("NewConfig(serialNum=64)",
-                 NewConfigOperation(64, stream_handler).toString());
-
-    EXPECT_EQUAL("Noop(serialNum=32)", NoopOperation(32).toString());
-
-    EXPECT_EQUAL("PruneRemovedDocuments(limitLid=0, subDbId=0, "
-                 "serialNum=0)",
-                 PruneRemovedDocumentsOperation().toString());
-    EXPECT_EQUAL("PruneRemovedDocuments(limitLid=15, subDbId=1, "
-                 "serialNum=0)",
-                 PruneRemovedDocumentsOperation(
-                         doc_id_limit, sub_db_id).toString());
-
-    EXPECT_EQUAL("Put(NULL, BucketId(0x0000000000000000), timestamp=0, dbdId=(subDbId=0, lid=0), "
-                 "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
-                 PutOperation().toString());
-    EXPECT_EQUAL("Put(id::::, BucketId(0x000000000000002a), timestamp=10, dbdId=(subDbId=0, lid=0), "
-                 "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
-                 PutOperation(bucket_id1, timestamp, std::move(doc)).toString());
-
-    EXPECT_EQUAL("Remove(id::::, BucketId(0x0000000000000000), timestamp=0, dbdId=(subDbId=0, lid=0), "
-                 "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
-                 RemoveOperationWithDocId().toString());
-    EXPECT_EQUAL("Remove(id:ns:foo:::bar, BucketId(0x000000000000002a), timestamp=10, dbdId=(subDbId=0, lid=0), "
-                 "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
-                 RemoveOperationWithDocId(bucket_id1, timestamp, doc_id).toString());
-
-    EXPECT_EQUAL("SplitBucket("
-                 "source=BucketId(0x0000000000000000), "
-                 "target1=BucketId(0x0000000000000000), "
-                 "target2=BucketId(0x0000000000000000), serialNum=0)",
-                 SplitBucketOperation().toString());
-    EXPECT_EQUAL("SplitBucket("
-                 "source=BucketId(0x000000000000002a), "
-                 "target1=BucketId(0x000000000000002b), "
-                 "target2=BucketId(0x000000000000002c), serialNum=0)",
-                 SplitBucketOperation(bucket_id1, bucket_id2, bucket_id3)
-                 .toString());
-    EXPECT_EQUAL("Update(NULL, BucketId(0x0000000000000000), timestamp=0, dbdId=(subDbId=0, lid=0), "
-                 "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
-                 UpdateOperation().toString());
-    EXPECT_EQUAL("Update(id:ns:foo:::bar, BucketId(0x000000000000002a), timestamp=10, dbdId=(subDbId=0, lid=0), "
-                 "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
-                 UpdateOperation(bucket_id1, timestamp, update).toString());
-
-    EXPECT_EQUAL("CompactLidSpace(subDbId=2, lidLimit=99, serialNum=0)",
-                 CompactLidSpaceOperation(2, 99).toString());
+    EXPECT_EQ("DeleteBucket(BucketId(0x0000000000000000), serialNum=0)",
+              DeleteBucketOperation().toString());
+    EXPECT_EQ("DeleteBucket(BucketId(0x000000000000002a), serialNum=0)",
+              DeleteBucketOperation(bucket_id1).toString());
+
+    EXPECT_EQ("JoinBuckets("
+              "source1=BucketId(0x0000000000000000), "
+              "source2=BucketId(0x0000000000000000), "
+              "target=BucketId(0x0000000000000000), serialNum=0)",
+              JoinBucketsOperation().toString());
+    EXPECT_EQ("JoinBuckets("
+              "source1=BucketId(0x000000000000002a), "
+              "source2=BucketId(0x000000000000002b), "
+              "target=BucketId(0x000000000000002c), serialNum=0)",
+              JoinBucketsOperation(bucket_id1, bucket_id2, bucket_id3)
+              .toString());
+
+    EXPECT_EQ("Move(NULL, BucketId(0x0000000000000000), timestamp=0, dbdId=(subDbId=0, lid=0), "
+              "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
+              MoveOperation().toString());
+    EXPECT_EQ("Move(id::::, BucketId(0x000000000000002a), timestamp=10, dbdId=(subDbId=1, lid=0), "
+              "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
+              MoveOperation(bucket_id1, timestamp, doc,
+                  db_doc_id, sub_db_id).toString());
+
+    EXPECT_EQ("NewConfig(serialNum=64)",
+              NewConfigOperation(64, stream_handler).toString());
+
+    EXPECT_EQ("Noop(serialNum=32)", NoopOperation(32).toString());
+
+    EXPECT_EQ("PruneRemovedDocuments(limitLid=0, subDbId=0, "
+              "serialNum=0)",
+              PruneRemovedDocumentsOperation().toString());
+    EXPECT_EQ("PruneRemovedDocuments(limitLid=15, subDbId=1, "
+              "serialNum=0)",
+              PruneRemovedDocumentsOperation(
+                  doc_id_limit, sub_db_id).toString());
+
+    EXPECT_EQ("Put(NULL, BucketId(0x0000000000000000), timestamp=0, dbdId=(subDbId=0, lid=0), "
+              "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
+              PutOperation().toString());
+    EXPECT_EQ("Put(id::::, BucketId(0x000000000000002a), timestamp=10, dbdId=(subDbId=0, lid=0), "
+              "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
+              PutOperation(bucket_id1, timestamp, std::move(doc)).toString());
+
+    EXPECT_EQ("Remove(id::::, BucketId(0x0000000000000000), timestamp=0, dbdId=(subDbId=0, lid=0), "
+              "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
+              RemoveOperationWithDocId().toString());
+    EXPECT_EQ("Remove(id:ns:foo:::bar, BucketId(0x000000000000002a), timestamp=10, dbdId=(subDbId=0, lid=0), "
+              "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
+              RemoveOperationWithDocId(bucket_id1, timestamp, doc_id).toString());
+
+    EXPECT_EQ("SplitBucket("
+              "source=BucketId(0x0000000000000000), "
+              "target1=BucketId(0x0000000000000000), "
+              "target2=BucketId(0x0000000000000000), serialNum=0)",
+              SplitBucketOperation().toString());
+    EXPECT_EQ("SplitBucket("
+              "source=BucketId(0x000000000000002a), "
+              "target1=BucketId(0x000000000000002b), "
+              "target2=BucketId(0x000000000000002c), serialNum=0)",
+              SplitBucketOperation(bucket_id1, bucket_id2, bucket_id3)
+              .toString());
+    EXPECT_EQ("Update(NULL, BucketId(0x0000000000000000), timestamp=0, dbdId=(subDbId=0, lid=0), "
+              "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
+              UpdateOperation().toString());
+    EXPECT_EQ("Update(id:ns:foo:::bar, BucketId(0x000000000000002a), timestamp=10, dbdId=(subDbId=0, lid=0), "
+              "prevDbdId=(subDbId=0, lid=0), prevMarkedAsRemoved=false, prevTimestamp=0, serialNum=0)",
+              UpdateOperation(bucket_id1, timestamp, update).toString());
+
+    EXPECT_EQ("CompactLidSpace(subDbId=2, lidLimit=99, serialNum=0)",
+              CompactLidSpaceOperation(2, 99).toString());
 }
 
-TEST("require that serialize/deserialize works for CompactLidSpaceOperation")
+TEST(FeedOperationTest, require_that_serialize_and_deserialize_works_for_CompactLidSpaceOperation)
 {
     vespalib::nbostream stream;
     {
         CompactLidSpaceOperation op(2, 99);
-        EXPECT_EQUAL(FeedOperation::COMPACT_LID_SPACE, op.getType());
-        EXPECT_EQUAL(2u, op.getSubDbId());
-        EXPECT_EQUAL(99u, op.getLidLimit());
+        EXPECT_EQ(FeedOperation::COMPACT_LID_SPACE, op.getType());
+        EXPECT_EQ(2u, op.getSubDbId());
+        EXPECT_EQ(99u, op.getLidLimit());
         op.serialize(stream);
     }
     {
         const document::DocumentTypeRepo repo;
         CompactLidSpaceOperation op;
         op.deserialize(stream, repo);
-        EXPECT_EQUAL(FeedOperation::COMPACT_LID_SPACE, op.getType());
-        EXPECT_EQUAL(2u, op.getSubDbId());
-        EXPECT_EQUAL(99u, op.getLidLimit());
+        EXPECT_EQ(FeedOperation::COMPACT_LID_SPACE, op.getType());
+        EXPECT_EQ(2u, op.getSubDbId());
+        EXPECT_EQ(99u, op.getLidLimit());
     }
 }
 
-TEST_F("require that we can serialize and deserialize update operations", Fixture)
+TEST(FeedOperationTest, require_that_we_can_serialize_and_deserialize_update_operations)
 {
+    Fixture f;
     vespalib::nbostream stream;
     BucketId bucket(toBucket(docId.getGlobalId()));
     auto upd(f.makeUpdate());
@@ -254,107 +255,111 @@ TEST_F("require that we can serialize and deserialize update operations", Fixtur
     {
         UpdateOperation op;
         op.deserialize(stream, *f._repo);
-        EXPECT_EQUAL(*upd, *op.getUpdate());
-        EXPECT_EQUAL(bucket, op.getBucketId());
-        EXPECT_EQUAL(10u, op.getTimestamp());
+        EXPECT_EQ(*upd, *op.getUpdate());
+        EXPECT_EQ(bucket, op.getBucketId());
+        EXPECT_EQ(10u, op.getTimestamp());
     }
 }
 
-TEST_F("require that we can serialize and deserialize put operations", Fixture)
+TEST(FeedOperationTest, require_that_we_can_serialize_and_deserialize_put_operations)
 {
+    Fixture f;
     vespalib::nbostream stream;
     BucketId bucket(toBucket(docId.getGlobalId()));
     auto doc(f.makeDoc());
     uint32_t expSerializedDocSize = getDocSize(*doc);
-    EXPECT_NOT_EQUAL(0u, expSerializedDocSize);
+    EXPECT_NE(0u, expSerializedDocSize);
     {
         PutOperation op(bucket, 10, doc);
         op.setDbDocumentId({1, 2});
         op.setPrevDbDocumentId({3, 4});
-        EXPECT_EQUAL(0u, op.getSerializedDocSize());
+        EXPECT_EQ(0u, op.getSerializedDocSize());
         op.serialize(stream);
-        EXPECT_EQUAL(expSerializedDocSize, op.getSerializedDocSize());
+        EXPECT_EQ(expSerializedDocSize, op.getSerializedDocSize());
     }
     {
         PutOperation op;
         op.deserialize(stream, *f._repo);
-        EXPECT_EQUAL(*doc, *op.getDocument());
-        TEST_DO(assertDocumentOperation(op, bucket, expSerializedDocSize));
+        EXPECT_EQ(*doc, *op.getDocument());
+        assertDocumentOperation(op, bucket, expSerializedDocSize);
     }
 }
 
-TEST_F("require that we can serialize and deserialize move operations", Fixture)
+TEST(FeedOperationTest, require_that_we_can_serialize_and_deserialize_move_operations)
 {
+    Fixture f;
     vespalib::nbostream stream;
     BucketId bucket(toBucket(docId.getGlobalId()));
     auto doc(f.makeDoc());
     uint32_t expSerializedDocSize = getDocSize(*doc);
-    EXPECT_NOT_EQUAL(0u, expSerializedDocSize);
+    EXPECT_NE(0u, expSerializedDocSize);
     {
-        MoveOperation op(bucket, TS_10 , doc, {3, 4}, 1);
+        MoveOperation op(bucket, TS_10, doc, {3, 4}, 1);
         op.setTargetLid(2);
-        EXPECT_EQUAL(0u, op.getSerializedDocSize());
+        EXPECT_EQ(0u, op.getSerializedDocSize());
         op.serialize(stream);
-        EXPECT_EQUAL(expSerializedDocSize, op.getSerializedDocSize());
+        EXPECT_EQ(expSerializedDocSize, op.getSerializedDocSize());
     }
     {
         MoveOperation op;
         op.deserialize(stream, *f._repo);
-        EXPECT_EQUAL(*doc, *op.getDocument());
-        TEST_DO(assertDocumentOperation(op, bucket, expSerializedDocSize));
+        EXPECT_EQ(*doc, *op.getDocument());
+        assertDocumentOperation(op, bucket, expSerializedDocSize);
     }
 }
 
-TEST_F("require that we can serialize and deserialize remove operations", Fixture)
+TEST(FeedOperationTest, require_that_we_can_serialize_and_deserialize_remove_operations)
 {
+    Fixture f;
     vespalib::nbostream stream;
     BucketId bucket(toBucket(docId.getGlobalId()));
     uint32_t expSerializedDocSize = getDocIdSize(docId);
-    EXPECT_NOT_EQUAL(0u, expSerializedDocSize);
+    EXPECT_NE(0u, expSerializedDocSize);
     {
-        RemoveOperationWithDocId op(bucket, TS_10 , docId);
+        RemoveOperationWithDocId op(bucket, TS_10, docId);
         op.setDbDocumentId({1, 2});
         op.setPrevDbDocumentId({3, 4});
-        EXPECT_EQUAL(0u, op.getSerializedDocSize());
+        EXPECT_EQ(0u, op.getSerializedDocSize());
         op.serialize(stream);
-        EXPECT_EQUAL(expSerializedDocSize, op.getSerializedDocSize());
+        EXPECT_EQ(expSerializedDocSize, op.getSerializedDocSize());
     }
     {
         RemoveOperationWithDocId op;
         op.deserialize(stream, *f._repo);
-        EXPECT_EQUAL(docId, op.getDocumentId());
-        TEST_DO(assertDocumentOperation(op, bucket, expSerializedDocSize));
+        EXPECT_EQ(docId, op.getDocumentId());
+        assertDocumentOperation(op, bucket, expSerializedDocSize);
     }
 }
 
-TEST_F("require that we can serialize and deserialize remove by gid operations", Fixture)
+TEST(FeedOperationTest, require_that_we_can_serialize_and_deserialize_remove_by_gid_operations)
 {
+    Fixture f;
     vespalib::nbostream stream;
     GlobalId gid = docId.getGlobalId();
     BucketId bucket(toBucket(gid));
     uint32_t expSerializedDocSize = 25;
     std::string expDocType = "testdoc_type";
-    EXPECT_NOT_EQUAL(0u, expSerializedDocSize);
+    EXPECT_NE(0u, expSerializedDocSize);
     {
-        RemoveOperationWithGid op(bucket, TS_10 , gid, expDocType);
+        RemoveOperationWithGid op(bucket, TS_10, gid, expDocType);
         op.setPrevDbDocumentId({3, 4});
-        EXPECT_EQUAL(0u, op.getSerializedDocSize());
+        EXPECT_EQ(0u, op.getSerializedDocSize());
         op.serialize(stream);
-        EXPECT_EQUAL(expSerializedDocSize, op.getSerializedDocSize());
+        EXPECT_EQ(expSerializedDocSize, op.getSerializedDocSize());
     }
     {
         RemoveOperationWithGid op;
         op.deserialize(stream, *f._repo);
-        EXPECT_EQUAL(gid, op.getGlobalId());
-        EXPECT_EQUAL(expDocType, op.getDocType());
-        EXPECT_EQUAL(bucket, op.getBucketId());
-        EXPECT_EQUAL(10u, op.getTimestamp());
-        EXPECT_EQUAL(expSerializedDocSize, op.getSerializedDocSize());
-        EXPECT_FALSE( op.getValidDbdId());
-        EXPECT_EQUAL(3u, op.getPrevSubDbId());
-        EXPECT_EQUAL(4u, op.getPrevLid());
+        EXPECT_EQ(gid, op.getGlobalId());
+        EXPECT_EQ(expDocType, op.getDocType());
+        EXPECT_EQ(bucket, op.getBucketId());
+        EXPECT_EQ(10u, op.getTimestamp());
+        EXPECT_EQ(expSerializedDocSize, op.getSerializedDocSize());
+        EXPECT_FALSE(op.getValidDbdId());
+        EXPECT_EQ(3u, op.getPrevSubDbId());
+        EXPECT_EQ(4u, op.getPrevLid());
         EXPECT_TRUE(stream.empty());
     }
 }
 
-}  // namespace
+}
diff --git a/searchcore/src/tests/proton/common/index_writer_test.cpp b/searchcore/src/tests/proton/common/index_writer_test.cpp
index 9f39d6ec66d9..72636c010d8f 100644
--- a/searchcore/src/tests/proton/common/index_writer_test.cpp
+++ b/searchcore/src/tests/proton/common/index_writer_test.cpp
@@ -51,7 +51,7 @@ struct MyIndexManager : public proton::test::MockIndexManager
         return toString(removes[lid]);
     }
     // Implements IIndexManager
-    void putDocument(uint32_t lid, const Document &, SerialNum serialNum, OnWriteDoneType) override {
+    void putDocument(uint32_t lid, const Document &, SerialNum serialNum, const OnWriteDoneType&) override {
         puts[lid].push_back(serialNum);
     }
     void removeDocuments(LidVector lids, SerialNum serialNum) override {
@@ -59,7 +59,7 @@ struct MyIndexManager : public proton::test::MockIndexManager
             removes[lid].push_back(serialNum);
         }
     }
-    void commit(SerialNum serialNum, OnWriteDoneType) override {
+    void commit(SerialNum serialNum, const OnWriteDoneType&) override {
         commitSerial = serialNum;
     }
     SerialNum getCurrentSerialNum() const override {
diff --git a/searchcore/src/tests/proton/documentdb/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/CMakeLists.txt
index b7c0e56ae722..8deea49faf5f 100644
--- a/searchcore/src/tests/proton/documentdb/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/CMakeLists.txt
@@ -19,6 +19,7 @@ vespa_add_executable(searchcore_documentdb_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
+    GTest::gtest
 )
 vespa_add_test(NAME searchcore_documentdb_test_app COMMAND searchcore_documentdb_test_app)
 
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/combiningfeedview_test.cpp
index 6ac2ccc0a9be..6ca58f2edda2 100644
--- a/searchcore/src/tests/proton/documentdb/combiningfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/combiningfeedview_test.cpp
@@ -71,12 +71,12 @@ struct MyFeedView : public test::DummyFeedView
     void prepareRemove(RemoveOperation &) override { ++_prepareRemove; }
     void handleRemove(FeedToken, const RemoveOperation &) override { ++_handleRemove; }
     void prepareDeleteBucket(DeleteBucketOperation &) override { ++_prepareDeleteBucket; }
-    void handleDeleteBucket(const DeleteBucketOperation &, DoneCallback) override { ++_handleDeleteBucket; }
+    void handleDeleteBucket(const DeleteBucketOperation &, const DoneCallback&) override { ++_handleDeleteBucket; }
     void prepareMove(MoveOperation &) override { ++_prepareMove; }
-    void handleMove(const MoveOperation &, DoneCallback) override { ++_handleMove; }
-    void heartBeat(SerialNum, DoneCallback) override { ++_heartBeat; }
-    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &, DoneCallback) override { ++_handlePrune; }
-    void handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback) override {
+    void handleMove(const MoveOperation &, const DoneCallback&) override { ++_handleMove; }
+    void heartBeat(SerialNum, const DoneCallback&) override { ++_heartBeat; }
+    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &, const DoneCallback&) override { ++_handlePrune; }
+    void handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback&) override {
         _wantedLidLimit = op.getLidLimit();
     }
 };
diff --git a/searchcore/src/tests/proton/documentdb/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer_test.cpp
index 2e32b6acbebf..fffe2edb6b06 100644
--- a/searchcore/src/tests/proton/documentdb/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer_test.cpp
@@ -228,7 +228,7 @@ Fixture::initViewSet(ViewSet &views)
     auto attrWriter = std::make_shared<AttributeWriter>(attrMgr);
     auto summaryAdapter = std::make_shared<SummaryAdapter>(summaryMgr);
     views._gidToLidChangeHandler = make_shared<MockGidToLidChangeHandler>();
-    Schema::SP schema(new Schema());
+    auto schema(std::make_shared<const Schema>());
     views._summaryMgr = summaryMgr;
     views._dmsc = metaStore;
     IndexSearchable::SP indexSearchable;
@@ -318,7 +318,7 @@ MyFastAccessFeedView::~MyFastAccessFeedView() = default;
 void
 MyFastAccessFeedView::init() {
     MySummaryAdapter::SP summaryAdapter = std::make_shared<MySummaryAdapter>();
-    Schema::SP schema = std::make_shared<Schema>();
+    auto schema = std::make_shared<const Schema>();
     _dmsc = make_shared<DocumentMetaStoreContext>(std::make_shared<bucketdb::BucketDBOwner>());
     std::shared_ptr<const DocumentTypeRepo> repo = createRepo();
     StoreOnlyFeedView::Context storeOnlyCtx(summaryAdapter, schema, _dmsc, repo,
@@ -382,9 +382,9 @@ createConfig()
 }
 
 DocumentDBConfig::SP
-createConfig(const Schema::SP &schema)
+createConfig(std::shared_ptr<const Schema> schema)
 {
-    return proton::test::DocumentDBConfigBuilder(0, schema, "client", DOC_TYPE).
+    return proton::test::DocumentDBConfigBuilder(0, std::move(schema), "client", DOC_TYPE).
             repo(createRepo()).build();
 }
 
diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
index ded6c4008863..40ba35513de2 100644
--- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
@@ -34,13 +34,13 @@
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/transactionlog/translogserver.h>
 #include <vespa/vespalib/data/slime/slime.h>
+#include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/net/socket_spec.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/size_literals.h>
+#include <vespa/vespalib/testkit/test_path.h>
 #include <filesystem>
 #include <iostream>
-#include <vespa/vespalib/testkit/test_kit.h>
-#include <vespa/vespalib/testkit/test_master.hpp>
 
 using namespace cloud::config::filedistribution;
 using namespace proton;
@@ -63,7 +63,6 @@ using vespalib::HwInfo;
 using vespalib::Slime;
 
 namespace {
-
 constexpr int tls_port = proton::test::port_numbers::documentdb_tls_port;
 
 std::string tls_port_spec() {
@@ -152,10 +151,10 @@ Fixture::Fixture(bool file_config)
     config::DirSpec spec(TEST_PATH("cfg"));
     DocumentDBConfigHelper mgr(spec, "typea");
     auto b = std::make_shared<BootstrapConfig>(1, documenttypesConfig, repo,
-                              std::make_shared<ProtonConfig>(),
-                              std::make_shared<FiledistributorrpcConfig>(),
-                              std::make_shared<BucketspacesConfig>(),
-                              tuneFileDocumentDB, HwInfo());
+                                               std::make_shared<ProtonConfig>(),
+                                               std::make_shared<FiledistributorrpcConfig>(),
+                                               std::make_shared<BucketspacesConfig>(),
+                                               tuneFileDocumentDB, HwInfo());
     mgr.forwardConfig(b);
     mgr.nextGeneration(_shared_service.transport(), 0ms);
     _db = DocumentDB::create(".", mgr.getConfig(), tls_port_spec(), _queryLimiter, DocTypeName("typea"),
@@ -198,7 +197,35 @@ extractRealFlushTarget(const IFlushTarget *target)
     return nullptr;
 }
 
-TEST_F("requireThatIndexFlushTargetIsUsed", Fixture) {
+}
+
+class DocumentDBTest : public ::testing::Test {
+protected:
+    DocumentDBTest();
+    ~DocumentDBTest() override;
+    static void SetUpTestSuite();
+    static void TearDownTestSuite();
+};
+
+DocumentDBTest::DocumentDBTest() = default;
+DocumentDBTest::~DocumentDBTest() = default;
+
+void
+DocumentDBTest::SetUpTestSuite()
+{
+    cleanup_dirs(true);
+    DummyFileHeaderContext::setCreator("documentdb_test");
+}
+
+void
+DocumentDBTest::TearDownTestSuite()
+{
+    cleanup_dirs(true);
+}
+
+TEST_F(DocumentDBTest, requireThatIndexFlushTargetIsUsed)
+{
+    Fixture f;
     auto targets = f._db->getFlushTargets();
     ASSERT_TRUE(!targets.empty());
     const IndexFlushTarget *index = nullptr;
@@ -214,6 +241,8 @@ TEST_F("requireThatIndexFlushTargetIsUsed", Fixture) {
     ASSERT_TRUE(index);
 }
 
+namespace {
+
 template <typename Target>
 size_t getNumTargets(const std::vector<IFlushTarget::SP> & targets)
 {
@@ -228,7 +257,11 @@ size_t getNumTargets(const std::vector<IFlushTarget::SP> & targets)
     return retval;
 }
 
-TEST_F("requireThatFlushTargetsAreNamedBySubDocumentDB", Fixture) {
+}
+
+TEST_F(DocumentDBTest, requireThatFlushTargetsAreNamedBySubDocumentDB)
+{
+    Fixture f;
     auto targets = f._db->getFlushTargets();
     ASSERT_TRUE(!targets.empty());
     for (const IFlushTarget::SP & target : f._db->getFlushTargets()) {
@@ -239,78 +272,90 @@ TEST_F("requireThatFlushTargetsAreNamedBySubDocumentDB", Fixture) {
     }
 }
 
-TEST_F("requireThatAttributeFlushTargetsAreUsed", Fixture) {
+TEST_F(DocumentDBTest, requireThatAttributeFlushTargetsAreUsed)
+{
+    Fixture f;
     auto targets = f._db->getFlushTargets();
     ASSERT_TRUE(!targets.empty());
     size_t numAttrs = getNumTargets<FlushableAttribute>(targets);
     // attr1 defined in attributes.cfg
-    EXPECT_EQUAL(1u, numAttrs);
+    EXPECT_EQ(1u, numAttrs);
 }
 
-TEST_F("requireThatDocumentMetaStoreFlushTargetIsUsed", Fixture) {
+TEST_F(DocumentDBTest, requireThatDocumentMetaStoreFlushTargetIsUsed)
+{
+    Fixture f;
     auto targets = f._db->getFlushTargets();
     ASSERT_TRUE(!targets.empty());
     size_t numMetaStores = getNumTargets<DocumentMetaStoreFlushTarget>(targets);
-    EXPECT_EQUAL(3u, numMetaStores);
+    EXPECT_EQ(3u, numMetaStores);
 }
 
-TEST_F("requireThatSummaryFlushTargetsIsUsed", Fixture) {
+TEST_F(DocumentDBTest, requireThatSummaryFlushTargetsIsUsed)
+{
+    Fixture f;
     auto targets = f._db->getFlushTargets();
     ASSERT_TRUE(!targets.empty());
     size_t num = getNumTargets<SummaryFlushTarget>(targets);
-    EXPECT_EQUAL(3u, num);
+    EXPECT_EQ(3u, num);
 }
 
-TEST_F("require that shrink lid space flush targets are created", Fixture) {
+TEST_F(DocumentDBTest, require_that_shrink_lid_space_flush_targets_are_created)
+{
+    Fixture f;
     auto targets = f._db->getFlushTargets();
     ASSERT_TRUE(!targets.empty());
     size_t num = getNumTargets<ShrinkLidSpaceFlushTarget>(targets);
     // 1x attribute, 3x document meta store, 3x document store
-    EXPECT_EQUAL(1u + 3u + 3u, num);
+    EXPECT_EQ(1u + 3u + 3u, num);
 }
 
-TEST_F("requireThatCorrectStatusIsReported", Fixture) {
+TEST_F(DocumentDBTest, requireThatCorrectStatusIsReported)
+{
+    Fixture f;
     StatusReport::UP report(f._db->reportStatus());
-    EXPECT_EQUAL("documentdb:typea", report->getComponent());
-    EXPECT_EQUAL(StatusReport::UPOK, report->getState());
-    EXPECT_EQUAL("", report->getMessage());
+    EXPECT_EQ("documentdb:typea", report->getComponent());
+    EXPECT_EQ(StatusReport::UPOK, report->getState());
+    EXPECT_EQ("", report->getMessage());
 }
 
-TEST_F("requireThatStateIsReported", Fixture)
+TEST_F(DocumentDBTest, requireThatStateIsReported)
 {
+    Fixture f;
     Slime slime;
     SlimeInserter inserter(slime);
     DocumentDBExplorer(f._db).get_state(inserter, false);
 
-    EXPECT_EQUAL(
-            "{\n"
-            "    \"documentType\": \"typea\",\n"
-            "    \"status\": {\n"
-            "        \"state\": \"ONLINE\",\n"
-            "        \"configState\": \"OK\"\n"
-            "    },\n"
-            "    \"documents\": {\n"
-            "        \"active\": 0,\n"
-            "        \"ready\": 0,\n"
-            "        \"total\": 0,\n"
-            "        \"removed\": 0\n"
-            "    }\n"
-            "}\n",
-            slime.toString());
+    EXPECT_EQ(
+        "{\n"
+        "    \"documentType\": \"typea\",\n"
+        "    \"status\": {\n"
+        "        \"state\": \"ONLINE\",\n"
+        "        \"configState\": \"OK\"\n"
+        "    },\n"
+        "    \"documents\": {\n"
+        "        \"active\": 0,\n"
+        "        \"ready\": 0,\n"
+        "        \"total\": 0,\n"
+        "        \"removed\": 0\n"
+        "    }\n"
+        "}\n",
+        slime.toString());
 }
 
-TEST_F("require that document db registers reference", Fixture)
+TEST_F(DocumentDBTest, require_that_document_db_registers_reference)
 {
+    Fixture f;
     auto &registry = f._myDBOwner._registry;
     auto reference = registry->get("typea");
     EXPECT_TRUE(reference);
     auto attr = reference->getAttribute("attr1");
     EXPECT_TRUE(attr);
     auto attrReadGuard = attr->makeReadGuard(false);
-    EXPECT_EQUAL(search::attribute::BasicType::INT32, attrReadGuard->attribute()->getBasicType());
+    EXPECT_EQ(search::attribute::BasicType::INT32, attrReadGuard->attribute()->getBasicType());
 }
 
-TEST("require that normal restart works")
+TEST_F(DocumentDBTest, require_that_normal_restart_works)
 {
     {
         Fixture f(true);
@@ -321,7 +366,7 @@ TEST("require that normal restart works")
     }
 }
 
-TEST("require that resume after interrupted save config works")
+TEST_F(DocumentDBTest, require_that_resume_after_interrupted_save_config_works)
 {
     SerialNum serialNum = 0;
     {
@@ -351,11 +396,4 @@ TEST("require that resume after interrupted save config works")
     }
 }
 
-}  // namespace
-
-TEST_MAIN() {
-    cleanup_dirs(true);
-    DummyFileHeaderContext::setCreator("documentdb_test");
-    TEST_RUN_ALL();
-    cleanup_dirs(true);
-}
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig_test.cpp
index 7826a7fa176a..fbbf6097b062 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfig_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfig_test.cpp
@@ -54,8 +54,8 @@ class MyConfigBuilder {
     test::DocumentDBConfigBuilder _builder;
 
 public:
-    MyConfigBuilder(int64_t generation, const Schema::SP &schema, const std::shared_ptr<const DocumentTypeRepo> &repo)
-        : _builder(generation, schema, "client", "test")
+    MyConfigBuilder(int64_t generation, std::shared_ptr<const Schema> schema, const std::shared_ptr<const DocumentTypeRepo> &repo)
+        : _builder(generation, std::move(schema), "client", "test")
     {
         _builder.repo(repo);
     }
@@ -170,7 +170,7 @@ TEST_F("require that makeReplayConfig() drops unneeded configs", Fixture)
 }
 
 struct DelayAttributeAspectFixture {
-    Schema::SP schema;
+    std::shared_ptr<const Schema> schema;
     ConfigSP attrCfg;
     ConfigSP noAttrCfg;
     explicit DelayAttributeAspectFixture(bool hasDocField)
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfigscout_test.cpp
index a1d3784ca44a..89141bef94de 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout_test.cpp
@@ -41,11 +41,11 @@ std::ostream& operator<<(std::ostream& os, const AttributesConfig::Attribute::Di
 namespace {
 
 DDBCSP
-getConfig(int64_t generation, const Schema::SP &schema,
+getConfig(int64_t generation, std::shared_ptr<const Schema> schema,
           const shared_ptr<const DocumentTypeRepo> & repo,
           const AttributesConfig &attributes)
 {
-    return test::DocumentDBConfigBuilder(generation, schema, "client", "test").
+    return test::DocumentDBConfigBuilder(generation, std::move(schema), "client", "test").
             repo(repo).attributes(make_shared<AttributesConfig>(attributes)).build();
 }
 
@@ -382,7 +382,7 @@ TEST("Test that DocumentDBConfigScout::scout looks ahead")
     setupLiveAttributes(liveAttributes.attribute);
 
     shared_ptr<const DocumentTypeRepo> repo(make_shared<DocumentTypeRepo>());
-    Schema::SP schema(make_shared<Schema>());
+    std::shared_ptr<const Schema> schema(make_shared<Schema>());
     DDBCSP cfg = getConfig(4, schema, repo, attributes);
     DDBCSP liveCfg = getConfig(4, schema, repo, liveAttributes);
     EXPECT_FALSE(*cfg == *liveCfg);
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index 7f319549e62b..f0ab172c574d 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -253,9 +253,9 @@ struct MyFeedView : public test::DummyFeedView {
         (void) token;
         ++remove_count;
     }
-    void handleMove(const MoveOperation &, DoneCallback) override { ++move_count; }
-    void heartBeat(SerialNum, DoneCallback) override { ++heartbeat_count; }
-    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &, DoneCallback) override { ++prune_removed_count; }
+    void handleMove(const MoveOperation &, const DoneCallback&) override { ++move_count; }
+    void heartBeat(SerialNum, const DoneCallback&) override { ++heartbeat_count; }
+    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &, const DoneCallback&) override { ++prune_removed_count; }
     const ISimpleDocumentMetaStore *getDocumentMetaStorePtr() const override {
         return nullptr;
     }
diff --git a/searchcore/src/tests/proton/documentdb/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview_test.cpp
index 81d293a26e43..c4a60fd59bc0 100644
--- a/searchcore/src/tests/proton/documentdb/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview_test.cpp
@@ -159,7 +159,7 @@ struct MyIndexWriter : public test::MockIndexWriter
           _wantedLidLimit(0),
           _tracer(tracer)
     {}
-    void put(SerialNum serialNum, const document::Document &doc, const DocumentIdT lid, OnWriteDoneType) override {
+    void put(SerialNum serialNum, const document::Document &doc, const DocumentIdT lid, const OnWriteDoneType&) override {
         (void) doc;
         _tracer.tracePut(indexAdapterTypeName, serialNum, lid);
     }
@@ -170,7 +170,7 @@ struct MyIndexWriter : public test::MockIndexWriter
             _tracer.traceRemove(indexAdapterTypeName, serialNum, lid);
         }
     }
-    void commit(SerialNum serialNum, OnWriteDoneType) override {
+    void commit(SerialNum serialNum, const OnWriteDoneType&) override {
         ++_commitCount;
         _tracer.traceCommit(indexAdapterTypeName, serialNum);
     }
@@ -343,18 +343,18 @@ struct MyAttributeWriter : public IAttributeWriter
         auto itr = _attrMap.find(attrName);
         return ((itr == _attrMap.end()) ? nullptr : itr->second.get());
     }
-    void put(SerialNum serialNum, const document::Document &doc, DocumentIdT lid, OnWriteDoneType) override {
+    void put(SerialNum serialNum, const document::Document &doc, DocumentIdT lid, const OnWriteDoneType&) override {
         _putSerial = serialNum;
         _putDocId = doc.getId();
         _putLid = lid;
         _tracer.tracePut(attributeAdapterTypeName, serialNum, lid);
     }
-    void remove(SerialNum serialNum, DocumentIdT lid, OnWriteDoneType) override {
+    void remove(SerialNum serialNum, DocumentIdT lid, const OnWriteDoneType&) override {
         _removeSerial = serialNum;
         _removeLid = lid;
         _tracer.traceRemove(attributeAdapterTypeName, serialNum, lid);
     }
-    void remove(const LidVector & lidsToRemove, SerialNum serialNum, OnWriteDoneType) override {
+    void remove(const LidVector & lidsToRemove, SerialNum serialNum, const OnWriteDoneType&) override {
         for (uint32_t lid : lidsToRemove) {
             LOG(info, "MyAttributeAdapter::remove(): serialNum(%" PRIu64 "), docId(%u)", serialNum, lid);
            _removes.push_back(lid);
@@ -362,7 +362,7 @@ struct MyAttributeWriter : public IAttributeWriter
         }
     }
     void update(SerialNum serialNum, const document::DocumentUpdate &upd,
-                DocumentIdT lid, OnWriteDoneType, IFieldUpdateCallback & onUpdate) override {
+                DocumentIdT lid, const OnWriteDoneType&, IFieldUpdateCallback & onUpdate) override {
         _updateSerial = serialNum;
         _updateDocId = upd.getId();
         _updateLid = lid;
@@ -371,23 +371,23 @@ struct MyAttributeWriter : public IAttributeWriter
             onUpdate.onUpdateField(fieldUpdate.getField(), attr);
         }
     }
-    void update(SerialNum serialNum, const document::Document &doc, DocumentIdT lid, OnWriteDoneType) override {
+    void update(SerialNum serialNum, const document::Document &doc, DocumentIdT lid, const OnWriteDoneType&) override {
         (void) serialNum;
         (void) doc;
         (void) lid;
     }
-    void heartBeat(SerialNum, OnWriteDoneType) override { ++_heartBeatCount; }
+    void heartBeat(SerialNum, const OnWriteDoneType&) override { ++_heartBeatCount; }
     void compactLidSpace(uint32_t wantedLidLimit, SerialNum ) override {
         _wantedLidLimit = wantedLidLimit;
     }
     const proton::IAttributeManager::SP &getAttributeManager() const override {
         return _mgr;
     }
-    void forceCommit(const CommitParam & param, OnWriteDoneType) override {
+    void forceCommit(const CommitParam & param, const OnWriteDoneType&) override {
         ++_commitCount;
         _tracer.traceCommit(attributeAdapterTypeName, param.lastSerialNum());
     }
-    void drain(OnWriteDoneType onDone) override {
+    void drain(const OnWriteDoneType& onDone) override {
         (void) onDone;
     }
 
@@ -433,7 +433,7 @@ MyTransport::~MyTransport() = default;
 struct SchemaContext
 {
     DocBuilder  _builder;
-    Schema::SP  _schema;
+    std::shared_ptr<const Schema>  _schema;
     SchemaContext();
     ~SchemaContext();
     std::shared_ptr<const document::DocumentTypeRepo> getRepo() const { return _builder.get_repo_sp(); }
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
index 1b195c1ab8a9..0820e808ab7d 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
@@ -73,7 +73,7 @@ saveBaseConfigSnapshot(FNET_Transport & transport, const DocumentDBConfig &snap,
 DocumentDBConfig::SP
 makeEmptyConfigSnapshot()
 {
-    return test::DocumentDBConfigBuilder(0, std::make_shared<Schema>(), "client", "test").build();
+    return test::DocumentDBConfigBuilder(0, std::make_shared<const Schema>(), "client", "test").build();
 }
 
 void
diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview_test.cpp
index 8938f1a07457..f1e1afb05ff8 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview_test.cpp
@@ -90,7 +90,7 @@ struct MyMinimalFeedView : public MyMinimalFeedViewBase, public StoreOnlyFeedVie
                       std::atomic<int> &outstandingMoveOps_) :
         MyMinimalFeedViewBase(),
         StoreOnlyFeedView(StoreOnlyFeedView::Context(summaryAdapter,
-                                                     search::index::Schema::SP(),
+                                                     {},
                                                      std::make_shared<DocumentMetaStoreContext>(metaStore),
                                                      myGetDocumentTypeRepo(),
                                                      std::move(pendingLidsForCommit),
@@ -104,19 +104,19 @@ struct MyMinimalFeedView : public MyMinimalFeedViewBase, public StoreOnlyFeedVie
         outstandingMoveOps(outstandingMoveOps_)
     {
     }
-    void removeAttributes(SerialNum s, const LidVector &l, OnWriteDoneType onWriteDone) override {
+    void removeAttributes(SerialNum s, const LidVector &l, const OnWriteDoneType& onWriteDone) override {
         StoreOnlyFeedView::removeAttributes(s, l, onWriteDone);
         ++removeMultiAttributesCount;
     }
-    void removeIndexedFields(SerialNum s, const LidVector &l, OnWriteDoneType onWriteDone) override {
+    void removeIndexedFields(SerialNum s, const LidVector &l, const OnWriteDoneType& onWriteDone) override {
         StoreOnlyFeedView::removeIndexedFields(s, l, onWriteDone);
         ++removeMultiIndexFieldsCount;
     }
-    void heartBeatIndexedFields(SerialNum s, DoneCallback onDone) override {
+    void heartBeatIndexedFields(SerialNum s, const DoneCallback& onDone) override {
         StoreOnlyFeedView::heartBeatIndexedFields(s, onDone);
         ++heartBeatIndexedFieldsCount;
     }
-    void heartBeatAttributes(SerialNum s, DoneCallback onDone) override {
+    void heartBeatAttributes(SerialNum s, const DoneCallback& onDone) override {
         StoreOnlyFeedView::heartBeatAttributes(s, onDone);
         ++heartBeatAttributesCount;
     }
@@ -146,26 +146,26 @@ struct MoveOperationFeedView : public MyMinimalFeedView {
             onWriteDoneContexts()
     {}
     ~MoveOperationFeedView() override;
-    void putAttributes(SerialNum, search::DocumentIdT, const document::Document &, OnPutDoneType onWriteDone) override {
+    void putAttributes(SerialNum, search::DocumentIdT, const document::Document &, const OnPutDoneType& onWriteDone) override {
         ++putAttributesCount;
         EXPECT_EQUAL(1, outstandingMoveOps);
         std::lock_guard guard(_mutex);
         onWriteDoneContexts.push_back(onWriteDone);
     }
      void putIndexedFields(SerialNum, search::DocumentIdT, const document::Document::SP &,
-                           OnOperationDoneType onWriteDone) override {
+                           const OnOperationDoneType& onWriteDone) override {
         ++putIndexFieldsCount;
         EXPECT_EQUAL(1, outstandingMoveOps);
          std::lock_guard guard(_mutex);
         onWriteDoneContexts.push_back(onWriteDone);
     }
-    void removeAttributes(SerialNum, search::DocumentIdT, OnRemoveDoneType onWriteDone) override {
+    void removeAttributes(SerialNum, search::DocumentIdT, const OnRemoveDoneType& onWriteDone) override {
         ++removeAttributesCount;
         EXPECT_EQUAL(1, outstandingMoveOps);
         std::lock_guard guard(_mutex);
         onWriteDoneContexts.push_back(onWriteDone);
     }
-    void removeIndexedFields(SerialNum, search::DocumentIdT, OnRemoveDoneType onWriteDone) override {
+    void removeIndexedFields(SerialNum, search::DocumentIdT, const OnRemoveDoneType& onWriteDone) override {
         ++removeIndexFieldsCount;
         EXPECT_EQUAL(1, outstandingMoveOps);
         std::lock_guard guard(_mutex);
diff --git a/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp b/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp
index 5671b974eabc..4cbf085f7316 100644
--- a/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp
+++ b/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp
@@ -174,7 +174,9 @@ TEST("require that max group size is calculated correctly") {
     for (size_t min_groups: std::vector<size_t>({0, 1, 2, 3, 4, 10, 500})) {
         for (size_t wanted_hits: std::vector<size_t>({0, 3, 321, 921})) {
             MatchPhaseLimitCalculator calc(100, min_groups, 0.2);
-            if (min_groups == 0) {
+            if (wanted_hits <= min_groups) {
+                EXPECT_EQUAL(size_t(1), calc.max_group_size(wanted_hits));
+            } else if (min_groups == 0) {
                 EXPECT_EQUAL(wanted_hits, calc.max_group_size(wanted_hits));
             } else {
                 EXPECT_EQUAL((wanted_hits / min_groups), calc.max_group_size(wanted_hits));
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp
index 698d4a1c9503..61b5987b7a99 100644
--- a/searchcore/src/tests/proton/matching/matching_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_test.cpp
@@ -1324,4 +1324,25 @@ TEST_F(MatchingTest, global_filter_params_are_scaled_with_active_hit_ratio)
     EXPECT_EQ(0.48, params.global_filter_upper_limit);
 }
 
+TEST_F(MatchingTest, abs_weak_and_stop_word_limit_is_calculated_correctly)
+{
+    AttributeBlueprintParamsFixture f(0.2, 0.8, 5.0, FMA::DfaTable);
+    EXPECT_EQ(WeakAndStopWordLimit::DEFAULT_VALUE, 1.0);
+    EXPECT_EQ(f.rank_setup.get_weakand_stop_word_limit(), 1.0);
+    EXPECT_EQ(f.extract(5, 100).abs_weakand_stop_word_limit, uint32_t(-1));
+    EXPECT_EQ(f.extract(5, 1000).abs_weakand_stop_word_limit, uint32_t(-1));
+    f.rank_setup.set_weakand_stop_word_limit(0.0);
+    EXPECT_EQ(f.rank_setup.get_weakand_stop_word_limit(), 0.0);
+    EXPECT_EQ(f.extract(5, 100).abs_weakand_stop_word_limit, uint32_t(0));
+    EXPECT_EQ(f.extract(5, 1000).abs_weakand_stop_word_limit, uint32_t(0));
+    f.rank_setup.set_weakand_stop_word_limit(0.25);
+    EXPECT_EQ(f.rank_setup.get_weakand_stop_word_limit(), 0.25);
+    EXPECT_EQ(f.extract(5, 100).abs_weakand_stop_word_limit, uint32_t(25));
+    EXPECT_EQ(f.extract(5, 1000).abs_weakand_stop_word_limit, uint32_t(250));
+    f.rank_setup.set_weakand_stop_word_limit(0.99);
+    EXPECT_EQ(f.rank_setup.get_weakand_stop_word_limit(), 0.99);
+    EXPECT_EQ(f.extract(5, 100).abs_weakand_stop_word_limit, uint32_t(99));
+    EXPECT_EQ(f.extract(5, 1000).abs_weakand_stop_word_limit, uint32_t(990));
+}
+
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
index 586199e4046e..447c51f9c969 100644
--- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
+++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
@@ -53,7 +53,7 @@ struct DBConfigFixture {
     JuniperrcConfigBuilder _juniperrcBuilder;
     ImportedFieldsConfigBuilder _importedFieldsBuilder;
 
-    Schema::SP buildSchema()
+    std::shared_ptr<const Schema> buildSchema()
     {
         return DocumentDBConfig::build_schema(_attributesBuilder, _indexschemaBuilder);
     }
diff --git a/searchcore/src/tests/proton/server/memoryconfigstore_test.cpp b/searchcore/src/tests/proton/server/memoryconfigstore_test.cpp
index ccb893b65a25..889df15ea679 100644
--- a/searchcore/src/tests/proton/server/memoryconfigstore_test.cpp
+++ b/searchcore/src/tests/proton/server/memoryconfigstore_test.cpp
@@ -15,16 +15,16 @@ using namespace proton;
 namespace {
 
 DocumentDBConfig::SP
-getConfig(int64_t generation, const Schema::SP &schema)
+getConfig(int64_t generation, std::shared_ptr<const Schema> schema)
 {
-    return test::DocumentDBConfigBuilder(generation, schema, "client", "test").build();
+    return test::DocumentDBConfigBuilder(generation, std::move(schema), "client", "test").build();
 }
 
 
 DocumentDBConfig::SP
 getConfig(int64_t generation)
 {
-    return getConfig(generation, Schema::SP());
+    return getConfig(generation, {});
 }
 
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
index 4849dc5a9a43..c5c4c731c4c0 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
@@ -158,7 +158,7 @@ ensureLidSpace(SerialNum serialNum, DocumentIdT lid, AttributeVector &attr)
 
 void
 applyPutToAttribute(SerialNum serialNum, const FieldValue::UP &fieldValue, DocumentIdT lid,
-                    AttributeVector &attr, AttributeWriter::OnWriteDoneType)
+                    AttributeVector &attr, const AttributeWriter::OnWriteDoneType&)
 {
     ensureLidSpace(serialNum, lid, attr);
     if (fieldValue.get()) {
@@ -199,7 +199,7 @@ complete_put_to_attribute(SerialNum serial_num,
                           uint32_t docid,
                           AttributeVector& attr,
                           std::future<FieldValueAndPrepareResult> result_future,
-                          AttributeWriter::OnWriteDoneType)
+                          const AttributeWriter::OnWriteDoneType&)
 {
     ensureLidSpace(serial_num, docid, attr);
     auto result = result_future.get();
@@ -213,7 +213,7 @@ complete_put_to_attribute(SerialNum serial_num,
 
 void
 applyRemoveToAttribute(SerialNum serialNum, DocumentIdT lid,
-                       AttributeVector &attr, AttributeWriter::OnWriteDoneType)
+                       AttributeVector &attr, const AttributeWriter::OnWriteDoneType&)
 {
     ensureLidSpace(serialNum, lid, attr);
     attr.clearDoc(lid);
@@ -246,7 +246,7 @@ applyHeartBeat(SerialNum serialNum, AttributeVector &attr)
 }
 
 void
-applyCommit(CommitParam param, AttributeWriter::OnWriteDoneType , AttributeVector &attr)
+applyCommit(CommitParam param, const AttributeWriter::OnWriteDoneType& , AttributeVector &attr)
 {
     SerialNum serialNum = param.lastSerialNum();
     if (attr.getStatus().getLastSyncToken() <= serialNum) {
@@ -342,15 +342,15 @@ class PutTask : public vespalib::Executor::Task
     const SerialNum      _serialNum;
     const uint32_t       _lid;
     const bool           _allAttributes;
-    std::remove_reference_t<AttributeWriter::OnWriteDoneType> _onWriteDone;
+    const AttributeWriter::OnWriteDoneType _onWriteDone;
     const Document&      _doc;
 public:
-    PutTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, const Document& doc, uint32_t lid, bool allAttributes, AttributeWriter::OnWriteDoneType onWriteDone);
+    PutTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, const Document& doc, uint32_t lid, bool allAttributes, const AttributeWriter::OnWriteDoneType& onWriteDone);
     ~PutTask() override;
     void run() override;
 };
 
-PutTask::PutTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, const Document& doc, uint32_t lid, bool allAttributes, AttributeWriter::OnWriteDoneType onWriteDone)
+PutTask::PutTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, const Document& doc, uint32_t lid, bool allAttributes, const AttributeWriter::OnWriteDoneType& onWriteDone)
     : _wc(wc),
       _serialNum(serialNum),
       _lid(lid),
@@ -461,17 +461,17 @@ class CompletePutTask : public vespalib::Executor::Task {
     const uint32_t _docid;
     AttributeVector& _attr;
     std::future<FieldValueAndPrepareResult> _result_future;
-    std::remove_reference_t<AttributeWriter::OnWriteDoneType> _on_write_done;
+    const AttributeWriter::OnWriteDoneType _on_write_done;
 
 public:
     CompletePutTask(PreparePutTask& prepare_task,
-                    AttributeWriter::OnWriteDoneType on_write_done);
+                    const AttributeWriter::OnWriteDoneType& on_write_done);
     ~CompletePutTask() override;
     void run() override;
 };
 
 CompletePutTask::CompletePutTask(PreparePutTask& prepare_task,
-                                 AttributeWriter::OnWriteDoneType on_write_done)
+                                 const AttributeWriter::OnWriteDoneType& on_write_done)
     : _serial_num(prepare_task.serial_num()),
       _docid(prepare_task.docid()),
       _attr(prepare_task.attr()),
@@ -495,14 +495,14 @@ class RemoveTask : public vespalib::Executor::Task
     const AttributeWriter::WriteContext  &_wc;
     const SerialNum      _serialNum;
     const uint32_t       _lid;
-    std::remove_reference_t<AttributeWriter::OnWriteDoneType> _onWriteDone;
+    const AttributeWriter::OnWriteDoneType _onWriteDone;
 public:
-    RemoveTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, uint32_t lid, AttributeWriter::OnWriteDoneType onWriteDone);
+    RemoveTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, uint32_t lid, const AttributeWriter::OnWriteDoneType& onWriteDone);
     ~RemoveTask() override;
     void run() override;
 };
 
-RemoveTask::RemoveTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, uint32_t lid, AttributeWriter::OnWriteDoneType onWriteDone)
+RemoveTask::RemoveTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, uint32_t lid, const AttributeWriter::OnWriteDoneType& onWriteDone)
     : _wc(wc),
       _serialNum(serialNum),
       _lid(lid),
@@ -530,12 +530,12 @@ class BatchRemoveTask : public vespalib::Executor::Task
     const AttributeWriter::WriteContext &_writeCtx;
     const SerialNum _serialNum;
     const LidVector _lidsToRemove;
-    std::remove_reference_t<AttributeWriter::OnWriteDoneType> _onWriteDone;
+    const AttributeWriter::OnWriteDoneType _onWriteDone;
 public:
     BatchRemoveTask(const AttributeWriter::WriteContext &writeCtx,
                     SerialNum serialNum,
                     const LidVector &lidsToRemove,
-                    AttributeWriter::OnWriteDoneType onWriteDone)
+                    const AttributeWriter::OnWriteDoneType& onWriteDone)
         : _writeCtx(writeCtx),
           _serialNum(serialNum),
           _lidsToRemove(lidsToRemove),
@@ -561,15 +561,15 @@ class CommitTask : public vespalib::Executor::Task
 {
     const AttributeWriter::WriteContext  &_wc;
     const CommitParam                     _param;
-    std::remove_reference_t<AttributeWriter::OnWriteDoneType> _onWriteDone;
+    const AttributeWriter::OnWriteDoneType _onWriteDone;
 public:
-    CommitTask(const AttributeWriter::WriteContext &wc, CommitParam param, AttributeWriter::OnWriteDoneType onWriteDone);
+    CommitTask(const AttributeWriter::WriteContext &wc, CommitParam param, const AttributeWriter::OnWriteDoneType& onWriteDone);
     ~CommitTask() override;
     void run() override;
 };
 
 
-CommitTask::CommitTask(const AttributeWriter::WriteContext &wc, CommitParam param, AttributeWriter::OnWriteDoneType onWriteDone)
+CommitTask::CommitTask(const AttributeWriter::WriteContext &wc, CommitParam param, const AttributeWriter::OnWriteDoneType& onWriteDone)
     : _wc(wc),
       _param(param),
       _onWriteDone(onWriteDone)
@@ -624,7 +624,7 @@ AttributeWriter::setupWriteContexts()
 
 void
 AttributeWriter::internalPut(SerialNum serialNum, const Document &doc, DocumentIdT lid,
-                             bool allAttributes, OnWriteDoneType onWriteDone)
+                             bool allAttributes, const OnWriteDoneType& onWriteDone)
 {
     for (const auto &wc : _writeContexts) {
         if (allAttributes && wc.use_two_phase_put()) {
@@ -644,7 +644,7 @@ AttributeWriter::internalPut(SerialNum serialNum, const Document &doc, DocumentI
 }
 
 void
-AttributeWriter::internalRemove(SerialNum serialNum, DocumentIdT lid, OnWriteDoneType onWriteDone)
+AttributeWriter::internalRemove(SerialNum serialNum, DocumentIdT lid, const OnWriteDoneType& onWriteDone)
 {
     for (const auto &wc : _writeContexts) {
         auto removeTask = std::make_unique<RemoveTask>(wc, serialNum, lid, onWriteDone);
@@ -678,7 +678,7 @@ AttributeWriter::~AttributeWriter() {
 }
 
 void
-AttributeWriter::drain(OnWriteDoneType onDone) {
+AttributeWriter::drain(const OnWriteDoneType& onDone) {
 
     for (const auto &wc : _writeContexts) {
         _attributeFieldWriter.executeLambda(wc.getExecutorId(), [onDone] () { (void) onDone; });
@@ -699,7 +699,7 @@ AttributeWriter::getWritableAttribute(const std::string &name) const
 }
 
 void
-AttributeWriter::put(SerialNum serialNum, const Document &doc, DocumentIdT lid, OnWriteDoneType onWriteDone)
+AttributeWriter::put(SerialNum serialNum, const Document &doc, DocumentIdT lid, const OnWriteDoneType& onWriteDone)
 {
     LOG(spam, "Handle put: serial(%" PRIu64 "), docId(%s), lid(%u), document(%s)",
         serialNum, doc.getId().toString().c_str(), lid, doc.toString(true).c_str());
@@ -707,7 +707,7 @@ AttributeWriter::put(SerialNum serialNum, const Document &doc, DocumentIdT lid,
 }
 
 void
-AttributeWriter::update(SerialNum serialNum, const Document &doc, DocumentIdT lid, OnWriteDoneType onWriteDone)
+AttributeWriter::update(SerialNum serialNum, const Document &doc, DocumentIdT lid, const OnWriteDoneType& onWriteDone)
 {
     LOG(spam, "Handle update: serial(%" PRIu64 "), docId(%s), lid(%u), document(%s)",
         serialNum, doc.getId().toString().c_str(), lid, doc.toString(true).c_str());
@@ -715,13 +715,13 @@ AttributeWriter::update(SerialNum serialNum, const Document &doc, DocumentIdT li
 }
 
 void
-AttributeWriter::remove(SerialNum serialNum, DocumentIdT lid, OnWriteDoneType onWriteDone)
+AttributeWriter::remove(SerialNum serialNum, DocumentIdT lid, const OnWriteDoneType& onWriteDone)
 {
     internalRemove(serialNum, lid, onWriteDone);
 }
 
 void
-AttributeWriter::remove(const LidVector &lidsToRemove, SerialNum serialNum, OnWriteDoneType onWriteDone)
+AttributeWriter::remove(const LidVector &lidsToRemove, SerialNum serialNum, const OnWriteDoneType& onWriteDone)
 {
     for (const auto &writeCtx : _writeContexts) {
         auto removeTask = std::make_unique<BatchRemoveTask>(writeCtx, serialNum, lidsToRemove, onWriteDone);
@@ -750,7 +750,7 @@ get_single_assign_update_field_value(const FieldUpdate& update)
 
 void
 AttributeWriter::update(SerialNum serialNum, const DocumentUpdate &upd, DocumentIdT lid,
-                        OnWriteDoneType onWriteDone, IFieldUpdateCallback & onUpdate)
+                        const OnWriteDoneType& onWriteDone, IFieldUpdateCallback & onUpdate)
 {
     LOG(debug, "Inspecting update for document %d.", lid);
     std::vector<std::unique_ptr<BatchUpdateTask>> args;
@@ -799,7 +799,7 @@ AttributeWriter::update(SerialNum serialNum, const DocumentUpdate &upd, Document
 }
 
 void
-AttributeWriter::heartBeat(SerialNum serialNum, OnWriteDoneType onDone)
+AttributeWriter::heartBeat(SerialNum serialNum, const OnWriteDoneType& onDone)
 {
     for (auto entry : _attrMap) {
         _attributeFieldWriter.execute(entry.second.executor_id,[serialNum, attr=entry.second.attribute, onDone]() {
@@ -811,7 +811,7 @@ AttributeWriter::heartBeat(SerialNum serialNum, OnWriteDoneType onDone)
 
 
 void
-AttributeWriter::forceCommit(const CommitParam & param, OnWriteDoneType onWriteDone)
+AttributeWriter::forceCommit(const CommitParam & param, const OnWriteDoneType& onWriteDone)
 {
     if (_mgr->getImportedAttributes() != nullptr) {
         std::vector<std::shared_ptr<ImportedAttributeVector>> importedAttrs;
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h
index 9dd0fb9b5f68..135b019ae2e3 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h
@@ -89,8 +89,8 @@ class AttributeWriter : public IAttributeWriter
     void setupWriteContexts();
     void setupAttributeMapping();
     void internalPut(SerialNum serialNum, const Document &doc, DocumentIdT lid,
-                     bool allAttributes, OnWriteDoneType onWriteDone);
-    void internalRemove(SerialNum serialNum, DocumentIdT lid, OnWriteDoneType onWriteDone);
+                     bool allAttributes, const OnWriteDoneType& onWriteDone);
+    void internalRemove(SerialNum serialNum, DocumentIdT lid, const OnWriteDoneType& onWriteDone);
 
 public:
     AttributeWriter(proton::IAttributeManager::SP mgr);
@@ -103,22 +103,22 @@ class AttributeWriter : public IAttributeWriter
      */
     std::vector<search::AttributeVector *> getWritableAttributes() const override;
     search::AttributeVector *getWritableAttribute(const std::string &name) const override;
-    void put(SerialNum serialNum, const Document &doc, DocumentIdT lid, OnWriteDoneType onWriteDone) override;
-    void remove(SerialNum serialNum, DocumentIdT lid, OnWriteDoneType onWriteDone) override;
-    void remove(const LidVector &lidVector, SerialNum serialNum, OnWriteDoneType onWriteDone) override;
+    void put(SerialNum serialNum, const Document &doc, DocumentIdT lid, const OnWriteDoneType& onWriteDone) override;
+    void remove(SerialNum serialNum, DocumentIdT lid, const OnWriteDoneType& onWriteDone) override;
+    void remove(const LidVector &lidVector, SerialNum serialNum, const OnWriteDoneType& onWriteDone) override;
     void update(SerialNum serialNum, const DocumentUpdate &upd, DocumentIdT lid,
-                OnWriteDoneType onWriteDone, IFieldUpdateCallback & onUpdate) override;
-    void update(SerialNum serialNum, const Document &doc, DocumentIdT lid, OnWriteDoneType onWriteDone) override;
-    void heartBeat(SerialNum serialNum, OnWriteDoneType onDone) override;
+                const OnWriteDoneType& onWriteDone, IFieldUpdateCallback & onUpdate) override;
+    void update(SerialNum serialNum, const Document &doc, DocumentIdT lid, const OnWriteDoneType& onWriteDone) override;
+    void heartBeat(SerialNum serialNum, const OnWriteDoneType& onDone) override;
     void compactLidSpace(uint32_t wantedLidLimit, SerialNum serialNum) override;
     const proton::IAttributeManager::SP &getAttributeManager() const override {
         return _mgr;
     }
-    void forceCommit(const CommitParam & param, OnWriteDoneType onWriteDone) override;
+    void forceCommit(const CommitParam & param, const OnWriteDoneType& onWriteDone) override;
 
     void onReplayDone(uint32_t docIdLimit) override;
     bool hasStructFieldAttribute() const override;
-    void drain(OnWriteDoneType onWriteDone) override;
+    void drain(const OnWriteDoneType& onWriteDone) override;
 
     // Should only be used for unit testing.
     const std::vector<WriteContext>& get_write_contexts() const {
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_writer.h b/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_writer.h
index 11301b3a4cdc..7991abd0ebea 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_writer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_writer.h
@@ -31,26 +31,26 @@ class IAttributeWriter {
     using DocumentIdT = search::DocumentIdT;
     using DocumentUpdate = document::DocumentUpdate;
     using Document = document::Document;
-    using OnWriteDoneType = const std::shared_ptr<vespalib::IDestructorCallback> &;
+    using OnWriteDoneType = std::shared_ptr<vespalib::IDestructorCallback>;
 
     virtual ~IAttributeWriter() = default;
 
     virtual std::vector<search::AttributeVector *> getWritableAttributes() const = 0;
     virtual search::AttributeVector *getWritableAttribute(const std::string &attrName) const = 0;
-    virtual void put(SerialNum serialNum, const Document &doc, DocumentIdT lid, OnWriteDoneType onWriteDone) = 0;
-    virtual void remove(SerialNum serialNum, DocumentIdT lid, OnWriteDoneType onWriteDone) = 0;
-    virtual void remove(const LidVector &lidVector, SerialNum serialNum, OnWriteDoneType onWriteDone) = 0;
+    virtual void put(SerialNum serialNum, const Document &doc, DocumentIdT lid, const OnWriteDoneType& onWriteDone) = 0;
+    virtual void remove(SerialNum serialNum, DocumentIdT lid, const OnWriteDoneType& onWriteDone) = 0;
+    virtual void remove(const LidVector &lidVector, SerialNum serialNum, const OnWriteDoneType& onWriteDone) = 0;
     /**
      * Update the underlying attributes based on the content of the given DocumentUpdate.
      * The OnWriteDoneType instance should ensure the lifetime of the given DocumentUpdate instance.
      */
     virtual void update(SerialNum serialNum, const DocumentUpdate &upd, DocumentIdT lid,
-                        OnWriteDoneType onWriteDone, IFieldUpdateCallback & onUpdate) = 0;
+                        const OnWriteDoneType& onWriteDone, IFieldUpdateCallback & onUpdate) = 0;
     /*
      * Update the underlying struct field attributes based on updated document.
      */
-    virtual void update(SerialNum serialNum, const Document &doc, DocumentIdT lid, OnWriteDoneType onWriteDone) = 0;
-    virtual void heartBeat(SerialNum serialNum, OnWriteDoneType onDone) = 0;
+    virtual void update(SerialNum serialNum, const Document &doc, DocumentIdT lid, const OnWriteDoneType& onWriteDone) = 0;
+    virtual void heartBeat(SerialNum serialNum, const OnWriteDoneType& onDone) = 0;
     /**
      * Compact the lid space of the underlying attribute vectors.
      */
@@ -60,11 +60,11 @@ class IAttributeWriter {
     /**
      * Commit all underlying attribute vectors with the given param.
      */
-    virtual void forceCommit(const CommitParam & param, OnWriteDoneType onWriteDone) = 0;
+    virtual void forceCommit(const CommitParam & param, const OnWriteDoneType& onWriteDone) = 0;
 
     virtual void onReplayDone(uint32_t docIdLimit) = 0;
     virtual bool hasStructFieldAttribute() const = 0;
-    virtual void drain(OnWriteDoneType onWriteDone) = 0;
+    virtual void drain(const OnWriteDoneType& onWriteDone) = 0;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/index/i_index_writer.h b/searchcore/src/vespa/searchcore/proton/index/i_index_writer.h
index 0ee294753353..2793f4750665 100644
--- a/searchcore/src/vespa/searchcore/proton/index/i_index_writer.h
+++ b/searchcore/src/vespa/searchcore/proton/index/i_index_writer.h
@@ -24,14 +24,14 @@ class IIndexWriter {
     virtual const std::shared_ptr<IIndexManager> &getIndexManager() const = 0;
 
     // feed interface
-    virtual void put(search::SerialNum serialNum, const document::Document &doc, const search::DocumentIdT lid, OnWriteDoneType on_write_done) = 0;
+    virtual void put(search::SerialNum serialNum, const document::Document &doc, const search::DocumentIdT lid, const OnWriteDoneType& on_write_done) = 0;
     void remove(search::SerialNum serialNum, search::DocumentIdT lid) {
         LidVector lids;
         lids.push_back(lid);
         removeDocs(serialNum, std::move(lids));
     }
     virtual void removeDocs(search::SerialNum serialNum, LidVector lids) = 0;
-    virtual void commit(search::SerialNum serialNum, OnWriteDoneType onWriteDone) = 0;
+    virtual void commit(search::SerialNum serialNum, const OnWriteDoneType& onWriteDone) = 0;
     virtual void heartBeat(search::SerialNum serialNum) = 0;
     virtual void compactLidSpace(search::SerialNum serialNum, const search::DocumentIdT lid) = 0;
 };
diff --git a/searchcore/src/vespa/searchcore/proton/index/index_writer.cpp b/searchcore/src/vespa/searchcore/proton/index/index_writer.cpp
index af57a074e1d7..a1dbf2c868a7 100644
--- a/searchcore/src/vespa/searchcore/proton/index/index_writer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/index/index_writer.cpp
@@ -24,7 +24,7 @@ IndexWriter::ignoreOperation(search::SerialNum serialNum) const {
 }
 
 void
-IndexWriter::put(search::SerialNum serialNum, const document::Document &doc, const search::DocumentIdT lid, OnWriteDoneType on_write_done)
+IndexWriter::put(search::SerialNum serialNum, const document::Document &doc, const search::DocumentIdT lid, const OnWriteDoneType& on_write_done)
 {
     if (ignoreOperation(serialNum)) {
         return;
@@ -56,7 +56,7 @@ IndexWriter::removeDocs(search::SerialNum serialNum, LidVector lids)
 }
 
 void
-IndexWriter::commit(search::SerialNum serialNum, OnWriteDoneType onWriteDone)
+IndexWriter::commit(search::SerialNum serialNum, const OnWriteDoneType& onWriteDone)
 {
     if (serialNum <= _mgr->getFlushedSerialNum()) {
         return;
diff --git a/searchcore/src/vespa/searchcore/proton/index/index_writer.h b/searchcore/src/vespa/searchcore/proton/index/index_writer.h
index 37f9322ee117..8c17102ea209 100644
--- a/searchcore/src/vespa/searchcore/proton/index/index_writer.h
+++ b/searchcore/src/vespa/searchcore/proton/index/index_writer.h
@@ -18,9 +18,9 @@ class IndexWriter : public IIndexWriter,
     ~IndexWriter() override;
     const IIndexManager::SP & getIndexManager() const override { return _mgr; }
 
-    void put(search::SerialNum serialNum, const document::Document &doc, const search::DocumentIdT lid, OnWriteDoneType on_write_done) override;
+    void put(search::SerialNum serialNum, const document::Document &doc, const search::DocumentIdT lid, const OnWriteDoneType& on_write_done) override;
     void removeDocs(search::SerialNum serialNum, LidVector lids) override;
-    void commit(search::SerialNum serialNum, OnWriteDoneType onWriteDone) override;
+    void commit(search::SerialNum serialNum, const OnWriteDoneType& onWriteDone) override;
 
     void heartBeat(search::SerialNum serialNum) override;
     void compactLidSpace(search::SerialNum serialNum, const search::DocumentIdT lid) override;
diff --git a/searchcore/src/vespa/searchcore/proton/index/indexmanager.h b/searchcore/src/vespa/searchcore/proton/index/indexmanager.h
index 7c1eb1737acb..c0e8eb9df0d8 100644
--- a/searchcore/src/vespa/searchcore/proton/index/indexmanager.h
+++ b/searchcore/src/vespa/searchcore/proton/index/indexmanager.h
@@ -86,7 +86,7 @@ class IndexManager : public searchcorespi::IIndexManager
     /**
      * Implements searchcorespi::IIndexManager
      **/
-    void putDocument(uint32_t lid, const Document &doc, SerialNum serialNum, OnWriteDoneType on_write_done) override {
+    void putDocument(uint32_t lid, const Document &doc, SerialNum serialNum, const OnWriteDoneType& on_write_done) override {
         _maintainer.putDocument(lid, doc, serialNum, on_write_done);
     }
 
@@ -94,7 +94,7 @@ class IndexManager : public searchcorespi::IIndexManager
         _maintainer.removeDocuments(std::move(lids), serialNum);
     }
 
-    void commit(SerialNum serialNum, OnWriteDoneType onWriteDone) override {
+    void commit(SerialNum serialNum, const OnWriteDoneType& onWriteDone) override {
         _maintainer.commit(serialNum, onWriteDone);
     }
 
diff --git a/searchcore/src/vespa/searchcore/proton/index/memoryindexwrapper.h b/searchcore/src/vespa/searchcore/proton/index/memoryindexwrapper.h
index 0a11dbbdb573..b51698bf60ed 100644
--- a/searchcore/src/vespa/searchcore/proton/index/memoryindexwrapper.h
+++ b/searchcore/src/vespa/searchcore/proton/index/memoryindexwrapper.h
@@ -71,13 +71,13 @@ class MemoryIndexWrapper : public searchcorespi::index::IMemoryIndex {
     bool hasReceivedDocumentInsert() const override {
         return _index.getDocIdLimit() > 1u;
     }
-    search::index::Schema::SP getPrunedSchema() const override {
+    std::shared_ptr<const search::index::Schema> getPrunedSchema() const override {
         return _index.getPrunedSchema();
     }
     vespalib::MemoryUsage getMemoryUsage() const override {
         return _index.getMemoryUsage();
     }
-    void insertDocument(uint32_t lid, const document::Document &doc, OnWriteDoneType on_write_done) override {
+    void insertDocument(uint32_t lid, const document::Document &doc, const OnWriteDoneType& on_write_done) override {
         _index.insertDocument(lid, doc, on_write_done);
     }
     void removeDocuments(LidVector lids) override {
@@ -86,7 +86,7 @@ class MemoryIndexWrapper : public searchcorespi::index::IMemoryIndex {
     uint64_t getStaticMemoryFootprint() const override {
         return _index.getStaticMemoryFootprint();
     }
-    void commit(OnWriteDoneType onWriteDone, SerialNum serialNum) override {
+    void commit(const OnWriteDoneType& onWriteDone, SerialNum serialNum) override {
         _index.commit(onWriteDone);
         _serialNum.store(serialNum, std::memory_order_relaxed);
     }
diff --git a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
index f8b6666afc4f..45953a9ac0c0 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
@@ -72,6 +72,7 @@ class BlueprintBuilderVisitor :
     void buildWeakAnd(ProtonWeakAnd &n) {
         auto *wand = new WeakAndBlueprint(n.getTargetNumHits(),
                                           _requestContext.get_attribute_blueprint_params().weakand_range,
+                                          _requestContext.get_attribute_blueprint_params().abs_weakand_stop_word_limit,
                                           is_search_multi_threaded());
         Blueprint::UP result(wand);
         for (auto node : n.getChildren()) {
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h
index c422529ea30e..a649f7161e17 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h
@@ -39,8 +39,8 @@ class MatchPhaseLimitCalculator
     size_t estimated_hits(double hit_rate, size_t num_docs) const noexcept {
         return (size_t) (hit_rate * num_docs);
     }
-    size_t max_group_size(size_t wanted_num_docs_in) const noexcept {
-        return (wanted_num_docs_in / _min_groups);
+    size_t max_group_size(size_t wanted_num_docs) const noexcept {
+        return std::max(size_t(1), wanted_num_docs / _min_groups);
     }
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
index 93989332bdca..c7fc684aa427 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
@@ -267,7 +267,7 @@ MatchToolsFactory::createDiversifier(uint32_t heapSize) const
         Issue::report("Skipping diversity due to no %s attribute.", _diversityParams.attribute.c_str());
         return {};
     }
-    size_t max_per_group = heapSize/_diversityParams.min_groups;
+    size_t max_per_group = std::max(size_t(1), size_t(heapSize / _diversityParams.min_groups));
     return DiversityFilter::create(*attr, heapSize, max_per_group, _diversityParams.min_groups,
                                    _diversityParams.cutoff_strategy == DiversityParams::CutoffStrategy::STRICT);
 }
@@ -351,6 +351,11 @@ MatchToolsFactory::extract_attribute_blueprint_params(const RankSetup& rank_setu
     double target_hits_max_adjustment_factor = TargetHitsMaxAdjustmentFactor::lookup(rank_properties, rank_setup.get_target_hits_max_adjustment_factor());
     auto fuzzy_matching_algorithm = FuzzyAlgorithm::lookup(rank_properties, rank_setup.get_fuzzy_matching_algorithm());
     double weakand_range = temporary::WeakAndRange::lookup(rank_properties, rank_setup.get_weakand_range());
+    double weakand_stop_word_limit = WeakAndStopWordLimit::lookup(rank_properties, rank_setup.get_weakand_stop_word_limit());
+
+    // make sure no words are stop words if the limit is 1.0, even those claiming to match more than everything
+    uint32_t abs_weakand_stop_word_limit = (weakand_stop_word_limit >= 0.0 && weakand_stop_word_limit < 1.0)
+                                           ? uint32_t(weakand_stop_word_limit * docid_limit) : uint32_t(-1);
 
     // Note that we count the reserved docid 0 as active.
     // This ensures that when searchable-copies=1, the ratio is 1.0.
@@ -360,7 +365,8 @@ MatchToolsFactory::extract_attribute_blueprint_params(const RankSetup& rank_setu
             upper_limit * active_hit_ratio,
             target_hits_max_adjustment_factor,
             fuzzy_matching_algorithm,
-            weakand_range};
+            weakand_range,
+            abs_weakand_stop_word_limit};
 }
 
 AttributeOperationTask::AttributeOperationTask(const RequestContext & requestContext,
diff --git a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp
index db815f946029..6c7b005e976a 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp
@@ -146,6 +146,8 @@ ResultProcessor::makeReply(PartialResultUP full_result)
         uint32_t docId = src.getDocId();
         if (_metaStore.getGidEvenIfMoved(docId, gid)) {
             dst.gid = gid;
+        } else {
+            LOG(warning, "Missing globalid for hit %u", docId);
         }
         dst.metric = src.getRank();
         LOG(debug, "convertLidToGid: hit[%zu]: lid(%u) -> gid(%s)", i, docId, dst.gid.toString().c_str());
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt
index 12ccaf919e45..f44651349d68 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt
@@ -4,6 +4,7 @@ vespa_add_library(searchcore_proton_metrics STATIC
     attribute_metrics.cpp
     attribute_metrics_entry.cpp
     content_proton_metrics.cpp
+    disk_usage_metrics.cpp
     documentdb_job_trackers.cpp
     documentdb_tagged_metrics.cpp
     document_db_commit_metrics.cpp
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/disk_usage_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/disk_usage_metrics.cpp
new file mode 100644
index 000000000000..5c96d7d2c4ca
--- /dev/null
+++ b/searchcore/src/vespa/searchcore/proton/metrics/disk_usage_metrics.cpp
@@ -0,0 +1,30 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "disk_usage_metrics.h"
+#include <vespa/searchlib/util/disk_io_stats.h>
+#include <vespa/vespalib/util/memoryusage.h>
+
+using search::DiskIoStats;
+
+namespace proton {
+
+DiskUsageMetrics::DiskUsageMetrics(metrics::MetricSet* parent)
+    : MetricSet("disk_usage", {}, "The disk usage for a given component", parent),
+      _size_on_disk("size_on_disk", {}, "Size on disk (bytes)", this),
+      _search_read_bytes("search_read_bytes", {}, "Bytes read in posting list files as part of search", this)
+{
+}
+
+DiskUsageMetrics::~DiskUsageMetrics() = default;
+
+void
+DiskUsageMetrics::update(uint64_t size_on_disk, const DiskIoStats& disk_io_stats)
+{
+    _size_on_disk.set(size_on_disk);
+    _search_read_bytes.addTotalValueBatch(disk_io_stats.read_bytes_total(),
+                                          disk_io_stats.read_operations(),
+                                          disk_io_stats.read_bytes_min(),
+                                          disk_io_stats.read_bytes_max());
+}
+
+}
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/disk_usage_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/disk_usage_metrics.h
new file mode 100644
index 000000000000..583640bde218
--- /dev/null
+++ b/searchcore/src/vespa/searchcore/proton/metrics/disk_usage_metrics.h
@@ -0,0 +1,25 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+#include <vespa/metrics/valuemetric.h>
+#include <vespa/metrics/metricset.h>
+
+namespace search { class DiskIoStats; }
+
+namespace proton {
+
+/**
+ * Metric set for disk usage metrics.
+ */
+class DiskUsageMetrics : public metrics::MetricSet {
+    metrics::LongValueMetric _size_on_disk;
+    metrics::LongValueMetric _search_read_bytes;
+
+public:
+    explicit DiskUsageMetrics(metrics::MetricSet* parent);
+    ~DiskUsageMetrics() override;
+    void update(uint64_t size_on_disk, const search::DiskIoStats& disk_io_stats);
+};
+
+}
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/index_metrics_entry.cpp b/searchcore/src/vespa/searchcore/proton/metrics/index_metrics_entry.cpp
index 648e97b7e8a2..e0930f70de39 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/index_metrics_entry.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/index_metrics_entry.cpp
@@ -12,7 +12,8 @@ const std::string entry_description("Metrics for indexes for a given field");
 }
 
 IndexMetricsEntry::IndexMetricsEntry(const std::string& field_name)
-    : FieldMetricsEntry(entry_name, field_name, entry_description)
+    : FieldMetricsEntry(entry_name, field_name, entry_description),
+      _disk_usage(this)
 {
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/index_metrics_entry.h b/searchcore/src/vespa/searchcore/proton/metrics/index_metrics_entry.h
index 2cb59dd50b2a..04a34ad38fa5 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/index_metrics_entry.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/index_metrics_entry.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "disk_usage_metrics.h"
 #include "field_metrics_entry.h"
 
 namespace proton {
@@ -11,6 +12,8 @@ namespace proton {
  * disk indexes and memory indexes.
  */
 struct IndexMetricsEntry : public FieldMetricsEntry {
+    DiskUsageMetrics _disk_usage;
+
     IndexMetricsEntry(const std::string& field_name);
     ~IndexMetricsEntry() override;
 };
diff --git a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
index 612b31b01230..7ef8b99c52b9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
@@ -186,7 +186,7 @@ CombiningFeedView::prepareDeleteBucket(DeleteBucketOperation &delOp)
 }
 
 void
-CombiningFeedView::handleDeleteBucket(const DeleteBucketOperation &delOp, DoneCallback onDone)
+CombiningFeedView::handleDeleteBucket(const DeleteBucketOperation &delOp, const DoneCallback& onDone)
 {
     for (const auto &view : _views) {
         view->handleDeleteBucket(delOp, onDone);
@@ -209,7 +209,7 @@ CombiningFeedView::prepareMove(MoveOperation &moveOp)
 }
 
 void
-CombiningFeedView::handleMove(const MoveOperation &moveOp, DoneCallback moveDoneCtx)
+CombiningFeedView::handleMove(const MoveOperation &moveOp, const DoneCallback& moveDoneCtx)
 {
     assert(moveOp.getValidDbdId());
     uint32_t subDbId = moveOp.getSubDbId();
@@ -224,7 +224,7 @@ CombiningFeedView::handleMove(const MoveOperation &moveOp, DoneCallback moveDone
 }
 
 void
-CombiningFeedView::heartBeat(search::SerialNum serialNum, DoneCallback onDone)
+CombiningFeedView::heartBeat(search::SerialNum serialNum, const DoneCallback& onDone)
 {
     for (const auto &view : _views) {
         view->heartBeat(serialNum, onDone);
@@ -232,7 +232,7 @@ CombiningFeedView::heartBeat(search::SerialNum serialNum, DoneCallback onDone)
 }
 
 void
-CombiningFeedView::forceCommit(const CommitParam & param, DoneCallback onDone)
+CombiningFeedView::forceCommit(const CommitParam & param, const DoneCallback& onDone)
 {
     for (const auto &view : _views) {
         view->forceCommit(param, onDone);
@@ -241,13 +241,13 @@ CombiningFeedView::forceCommit(const CommitParam & param, DoneCallback onDone)
 
 void
 CombiningFeedView::
-handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp, DoneCallback onDone)
+handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp, const DoneCallback& onDone)
 {
     getRemFeedView()->handlePruneRemovedDocuments(pruneOp, onDone);
 }
 
 void
-CombiningFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback onDone)
+CombiningFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback& onDone)
 {
     uint32_t subDbId = op.getSubDbId();
     assert(subDbId < _views.size());
diff --git a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h
index 2890aa7ac0f8..4e8952675ecd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.h
@@ -49,7 +49,7 @@ class CombiningFeedView : public IFeedView
     }
 
     vespalib::Trinary shouldBeReady(const document::BucketId &bucket) const;
-    void forceCommit(const CommitParam & param, DoneCallback onDone) override;
+    void forceCommit(const CommitParam & param, const DoneCallback& onDone) override;
 public:
     using SP = std::shared_ptr<CombiningFeedView>;
 
@@ -74,11 +74,11 @@ class CombiningFeedView : public IFeedView
     void prepareDeleteBucket(DeleteBucketOperation &delOp) override;
     bool isMoveStillValid(const MoveOperation & moveOp) const override;
     void prepareMove(MoveOperation &putOp) override;
-    void handleDeleteBucket(const DeleteBucketOperation &delOp, DoneCallback onDone) override;
-    void handleMove(const MoveOperation &moveOp, DoneCallback onDone) override;
-    void heartBeat(search::SerialNum serialNum, DoneCallback onDone) override;
-    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp, DoneCallback onDone) override;
-    void handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback onDone) override;
+    void handleDeleteBucket(const DeleteBucketOperation &delOp, const DoneCallback& onDone) override;
+    void handleMove(const MoveOperation &moveOp, const DoneCallback& onDone) override;
+    void heartBeat(search::SerialNum serialNum, const DoneCallback& onDone) override;
+    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp, const DoneCallback& onDone) override;
+    void handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback& onDone) override;
 
     // Called by document db executor
     void setCalculator(const std::shared_ptr<IBucketStateCalculator> &newCalc);
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.cpp b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.cpp
index 49aef8cb792e..32073ea17be8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.cpp
@@ -12,7 +12,8 @@ DocumentSubDbInitializerResult::DocumentSubDbInitializerResult()
       _summaryManager(std::make_shared<SummaryManager::SP>()),
       _attributeManager(std::make_shared<AttributeManager::SP>()),
       _indexManager(std::make_shared<IIndexManager::SP>()),
-      _flushConfig()
+      _flushConfig(),
+      _schema()
 {
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.h b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.h
index 1bd108a588b4..53986c86d8a6 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.h
@@ -23,6 +23,7 @@ class DocumentSubDbInitializerResult
     std::shared_ptr<AttributeManager::SP> _attributeManager;
     std::shared_ptr<searchcorespi::IIndexManager::SP> _indexManager;
     DocumentDBFlushConfig _flushConfig;
+    std::shared_ptr<const search::index::Schema> _schema;
 
 public:
     DocumentSubDbInitializerResult();
@@ -53,6 +54,8 @@ class DocumentSubDbInitializerResult
 
     void setFlushConfig(const DocumentDBFlushConfig &flushConfig);
     const DocumentDBFlushConfig &getFlushConfig() const { return _flushConfig; }
+    void set_schema(std::shared_ptr<const search::index::Schema> schema) { _schema = std::move(schema); }
+    std::shared_ptr<const search::index::Schema> get_schema() const { return _schema; }
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index 4263fabdd05b..39c3b73e42fb 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -431,7 +431,6 @@ DocumentDB::applyConfig(DocumentDBConfig::SP configSnapshot, SerialNum serialNum
 
     auto start_time = vespalib::steady_clock::now();
     DocumentDBConfig::ComparisonResult cmpres;
-    Schema::SP oldSchema;
     {
         lock_guard guard(_configMutex);
         assert(_activeConfigSnapshot.get());
@@ -569,6 +568,9 @@ DocumentDB::close()
     _metricsWireService.set_attributes(metrics.ready.attributes, {});
     _metricsWireService.set_attributes(metrics.notReady.attributes, {});
 
+    // Tear down index metrics
+    _metricsWireService.set_index_fields(metrics.ready.index, {});
+
     masterExecute([this] () {
         closeSubDBs();
     });
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp
index 57f55881372c..36e369cb4917 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp
@@ -79,6 +79,14 @@ updateIndexMetrics(DocumentDBTaggedMetrics &metrics, const search::SearchableSta
     updateDiskUsageMetric(indexMetrics.diskUsage, stats.sizeOnDisk(), totalStats);
     updateMemoryUsageMetrics(indexMetrics.memoryUsage, stats.memoryUsage(), totalStats);
     indexMetrics.docsInMemory.set(stats.docsInMemory());
+    auto& field_metrics = metrics.ready.index;
+    for (auto& field : stats.get_field_stats()) {
+        auto entry = field_metrics.get_field_metrics_entry(field.first);
+        if (entry) {
+            entry->memoryUsage.update(field.second.memory_usage());
+            entry->_disk_usage.update(field.second.size_on_disk(), field.second.disk_io_stats());
+        }
+    }
 }
 
 struct TempAttributeMetric
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp
index 659e86967520..93a9b33b4ddd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp
@@ -66,7 +66,7 @@ DocumentDBConfig::DocumentDBConfig(
                const std::shared_ptr<const DocumentTypeRepo> &repo,
                const ImportedFieldsConfigSP &importedFields,
                const search::TuneFileDocumentDB::SP &tuneFileDocumentDB,
-               const Schema::SP &schema,
+               std::shared_ptr<const Schema> schema,
                const DocumentDBMaintenanceConfig::SP &maintenance,
                const search::LogDocumentStore::Config & storeConfig,
                const ThreadingServiceConfig & threading_service_config,
@@ -88,7 +88,7 @@ DocumentDBConfig::DocumentDBConfig(
       _repo(repo),
       _importedFields(importedFields),
       _tuneFileDocumentDB(tuneFileDocumentDB),
-      _schema(schema),
+      _schema(std::move(schema)),
       _maintenance(maintenance),
       _storeConfig(storeConfig),
       _threading_service_config(threading_service_config),
@@ -338,7 +338,7 @@ DocumentDBConfig::getDocumentType() const
     return _repo->getDocumentType(getDocTypeName());
 }
 
-std::shared_ptr<Schema>
+std::shared_ptr<const Schema>
 DocumentDBConfig::build_schema(const AttributesConfig& attributes_config,
                                const IndexschemaConfig &indexschema_config)
 {
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h
index fe72c35b1407..86b32dd50e97 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h
@@ -126,7 +126,7 @@ class DocumentDBConfig
     std::shared_ptr<const document::DocumentTypeRepo>   _repo;
     ImportedFieldsConfigSP                    _importedFields;
     search::TuneFileDocumentDB::SP            _tuneFileDocumentDB;
-    search::index::Schema::SP                 _schema;
+    std::shared_ptr<const search::index::Schema> _schema;
     MaintenanceConfigSP                       _maintenance;
     search::LogDocumentStore::Config          _storeConfig;
     const ThreadingServiceConfig              _threading_service_config;
@@ -165,7 +165,7 @@ class DocumentDBConfig
                      const std::shared_ptr<const document::DocumentTypeRepo> &repo,
                      const ImportedFieldsConfigSP &importedFields,
                      const search::TuneFileDocumentDB::SP &tuneFileDocumentDB,
-                     const search::index::Schema::SP &schema,
+                     std::shared_ptr<const search::index::Schema> schema,
                      const DocumentDBMaintenanceConfig::SP &maintenance,
                      const search::LogDocumentStore::Config & storeConfig,
                      const ThreadingServiceConfig & threading_service_config,
@@ -206,7 +206,7 @@ class DocumentDBConfig
     const document::DocumentType *getDocumentType() const;
     const ImportedFieldsConfig &getImportedFieldsConfig() const { return *_importedFields; }
     const ImportedFieldsConfigSP &getImportedFieldsConfigSP() const { return _importedFields; }
-    const search::index::Schema::SP &getSchemaSP() const { return _schema; }
+    const std::shared_ptr<const search::index::Schema>& getSchemaSP() const noexcept { return _schema; }
     const MaintenanceConfigSP &getMaintenanceConfigSP() const { return _maintenance; }
     const search::TuneFileDocumentDB::SP &getTuneFileDocumentDBSP() const { return _tuneFileDocumentDB; }
     bool getDelayedAttributeAspects() const { return _delayedAttributeAspects; }
@@ -253,7 +253,7 @@ class DocumentDBConfig
     static SP makeDelayedAttributeAspectConfig(const SP &newCfg, const DocumentDBConfig &oldCfg);
     SP make_copy() const;
 
-    static std::shared_ptr<search::index::Schema>
+    static std::shared_ptr<const search::index::Schema>
     build_schema(const AttributesConfig& attributes_config,
                  const IndexschemaConfig &indexschema_config);
 };
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
index 3557cc01aeae..83744c775802 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
@@ -69,12 +69,12 @@ DocumentDBConfigManager::createConfigKeySet() const
     return set;
 }
 
-Schema::SP
+std::shared_ptr<const Schema>
 DocumentDBConfigManager::buildSchema(const AttributesConfig &newAttributesConfig,
                                      const IndexschemaConfig &newIndexschemaConfig)
 {
     // Called with lock held
-    Schema::SP oldSchema;
+    std::shared_ptr<const Schema> oldSchema;
     if (_pendingConfigSnapshot) {
         oldSchema = _pendingConfigSnapshot->getSchemaSP();
     }
@@ -335,7 +335,7 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot
     JuniperrcConfigSP newJuniperrcConfig = snapshot.getConfig<JuniperrcConfig>(_configId);
     ImportedFieldsConfigSP newImportedFieldsConfig = snapshot.getConfig<ImportedFieldsConfig>(_configId);
 
-    Schema::SP schema(buildSchema(*newAttributesConfig, *newIndexschemaConfig));
+    auto schema(buildSchema(*newAttributesConfig, *newIndexschemaConfig));
     newMaintenanceConfig = buildMaintenanceConfig(_bootstrapConfig, _docTypeName);
     search::LogDocumentStore::Config storeConfig = buildStoreConfig(_bootstrapConfig->getProtonConfig(),
                                                                     _bootstrapConfig->getHwInfo());
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.h b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.h
index 6facd65057f7..c1923637d28c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.h
@@ -32,7 +32,7 @@ class DocumentDBConfigManager
     bool                 _ignoreForwardedConfig;
     mutable std::mutex   _pendingConfigMutex;
 
-    search::index::Schema::SP
+    std::shared_ptr<const search::index::Schema>
     buildSchema(const DocumentDBConfig::AttributesConfig & newAttributesConfig,
                 const DocumentDBConfig::IndexschemaConfig & newIndexschemaConfig);
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp
index 8c7367482a36..6b7a2afa23cb 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp
@@ -22,7 +22,7 @@ using ARIConfig = AttributeReprocessingInitializer::Config;
 
 void
 FastAccessDocSubDBConfigurer::reconfigureFeedView(FastAccessFeedView & curr,
-                                                  std::shared_ptr<Schema> schema,
+                                                  std::shared_ptr<const Schema> schema,
                                                   std::shared_ptr<const DocumentTypeRepo> repo,
                                                   std::shared_ptr<IAttributeWriter> writer)
 {
diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.h b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.h
index af6074905e42..3c05648fb256 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.h
@@ -35,7 +35,7 @@ class FastAccessDocSubDBConfigurer
     std::string             _subDbName;
 
     void reconfigureFeedView(FastAccessFeedView & curr,
-                             std::shared_ptr<search::index::Schema> schema,
+                             std::shared_ptr<const search::index::Schema> schema,
                              std::shared_ptr<const document::DocumentTypeRepo> repo,
                              std::shared_ptr<IAttributeWriter> attrWriter);
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
index d5fcd0a4f076..140eddb4770d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
@@ -19,20 +19,20 @@ namespace proton {
  * Otherwise we can drop it and ack the operation right away.
  */
 void
-FastAccessFeedView::putAttributes(SerialNum serialNum, search::DocumentIdT lid, const Document &doc, OnPutDoneType onWriteDone)
+FastAccessFeedView::putAttributes(SerialNum serialNum, search::DocumentIdT lid, const Document &doc, const OnPutDoneType& onWriteDone)
 {
     _attributeWriter->put(serialNum, doc, lid, onWriteDone);
 }
 
 void
 FastAccessFeedView::updateAttributes(SerialNum serialNum, search::DocumentIdT lid, const DocumentUpdate &upd,
-                                     OnOperationDoneType onWriteDone, IFieldUpdateCallback & onUpdate)
+                                     const OnOperationDoneType& onWriteDone, IFieldUpdateCallback & onUpdate)
 {
     _attributeWriter->update(serialNum, upd, lid, onWriteDone, onUpdate);
 }
 
 void
-FastAccessFeedView::updateAttributes(SerialNum serialNum, Lid lid, FutureDoc futureDoc, OnOperationDoneType onWriteDone)
+FastAccessFeedView::updateAttributes(SerialNum serialNum, Lid lid, FutureDoc futureDoc, const OnOperationDoneType& onWriteDone)
 {
     if (_attributeWriter->hasStructFieldAttribute()) {
         const std::unique_ptr<const Document> & doc = futureDoc.get();
@@ -43,19 +43,19 @@ FastAccessFeedView::updateAttributes(SerialNum serialNum, Lid lid, FutureDoc fut
 }
 
 void
-FastAccessFeedView::removeAttributes(SerialNum serialNum, search::DocumentIdT lid, OnRemoveDoneType onWriteDone)
+FastAccessFeedView::removeAttributes(SerialNum serialNum, search::DocumentIdT lid, const OnRemoveDoneType& onWriteDone)
 {
     _attributeWriter->remove(serialNum, lid, onWriteDone);
 }
 
 void
-FastAccessFeedView::removeAttributes(SerialNum serialNum, const LidVector &lidsToRemove, OnWriteDoneType onWriteDone)
+FastAccessFeedView::removeAttributes(SerialNum serialNum, const LidVector &lidsToRemove, const OnWriteDoneType& onWriteDone)
 {
     _attributeWriter->remove(lidsToRemove, serialNum, onWriteDone);
 }
 
 void
-FastAccessFeedView::heartBeatAttributes(SerialNum serialNum, DoneCallback onDone)
+FastAccessFeedView::heartBeatAttributes(SerialNum serialNum, const DoneCallback& onDone)
 {
     _attributeWriter->heartBeat(serialNum, onDone);
 }
@@ -69,7 +69,7 @@ FastAccessFeedView::FastAccessFeedView(StoreOnlyFeedView::Context storeOnlyCtx,
 FastAccessFeedView::~FastAccessFeedView() = default;
 
 void
-FastAccessFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback onDone)
+FastAccessFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback& onDone)
 {
     // Drain pending PutDoneContext and ForceCommitContext objects
     forceCommitAndWait(search::CommitParam(op.getSerialNum()));
@@ -79,7 +79,7 @@ FastAccessFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, Do
 }
 
 void
-FastAccessFeedView::internalForceCommit(const CommitParam & param, OnForceCommitDoneType onCommitDone)
+FastAccessFeedView::internalForceCommit(const CommitParam & param, const OnForceCommitDoneType& onCommitDone)
 {
     _attributeWriter->forceCommit(param, onCommitDone);
     onCommitDone->registerCommittedDocIdLimit(_metaStore.getCommittedDocIdLimit(), &_docIdLimit);
diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.h b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.h
index 00496a7e868a..0db95ebc1a19 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.h
+++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.h
@@ -36,19 +36,19 @@ class FastAccessFeedView : public StoreOnlyFeedView
     const IAttributeWriter::SP _attributeWriter;
     DocIdLimit                 &_docIdLimit;
 
-    void putAttributes(SerialNum serialNum, search::DocumentIdT lid, const Document &doc, OnPutDoneType onWriteDone) override;
+    void putAttributes(SerialNum serialNum, search::DocumentIdT lid, const Document &doc, const OnPutDoneType& onWriteDone) override;
 
     void updateAttributes(SerialNum serialNum, search::DocumentIdT lid, const document::DocumentUpdate &upd,
-                          OnOperationDoneType onWriteDone, IFieldUpdateCallback & onUpdate) override;
-    void updateAttributes(SerialNum serialNum, Lid lid, FutureDoc doc, OnOperationDoneType onWriteDone) override;
-    void removeAttributes(SerialNum serialNum, search::DocumentIdT lid, OnRemoveDoneType onWriteDone) override;
+                          const OnOperationDoneType& onWriteDone, IFieldUpdateCallback & onUpdate) override;
+    void updateAttributes(SerialNum serialNum, Lid lid, FutureDoc doc, const OnOperationDoneType& onWriteDone) override;
+    void removeAttributes(SerialNum serialNum, search::DocumentIdT lid, const OnRemoveDoneType& onWriteDone) override;
 
-    void removeAttributes(SerialNum serialNum, const LidVector &lidsToRemove, OnWriteDoneType onWriteDone) override;
+    void removeAttributes(SerialNum serialNum, const LidVector &lidsToRemove, const OnWriteDoneType& onWriteDone) override;
 
-    void heartBeatAttributes(SerialNum serialNum, DoneCallback onDone) override;
+    void heartBeatAttributes(SerialNum serialNum, const DoneCallback& onDone) override;
 
 protected:
-    void internalForceCommit(const CommitParam & param, OnForceCommitDoneType onCommitDone) override;
+    void internalForceCommit(const CommitParam & param, const OnForceCommitDoneType& onCommitDone) override;
 
 public:
     FastAccessFeedView(StoreOnlyFeedView::Context storeOnlyCtx, const PersistentParams &params, const Context &ctx);
@@ -62,7 +62,7 @@ class FastAccessFeedView : public StoreOnlyFeedView
         return _docIdLimit;
     }
 
-    void handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback onDone) override;
+    void handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback& onDone) override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h b/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h
index 81efe9c00c84..d5eaf2db2e74 100644
--- a/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/idocumentsubdb.h
@@ -62,7 +62,6 @@ class IDocumentSubDB
     using UP = std::unique_ptr<IDocumentSubDB>;
     using SerialNum = search::SerialNum;
     using Schema = search::index::Schema;
-    using SchemaSP = std::shared_ptr<Schema>;
     using IFlushTargetList = std::vector<std::shared_ptr<searchcorespi::IFlushTarget>>;
     using IndexConfig = index::IndexConfig;
     using OnDone = std::shared_ptr<vespalib::IDestructorCallback>;
@@ -122,7 +121,7 @@ class IDocumentSubDB
      */
     virtual SerialNum getNewestFlushedSerial()  = 0;
     virtual void pruneRemovedFields(SerialNum serialNum) = 0;
-    virtual void setIndexSchema(const SchemaSP &schema, SerialNum serialNum) = 0;
+    virtual void setIndexSchema(std::shared_ptr<const Schema> schema, SerialNum serialNum) = 0;
     virtual search::SearchableStats getSearchableStats() const = 0;
     virtual std::shared_ptr<IDocumentRetriever> getDocumentRetriever() = 0;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/ifeedview.h b/searchcore/src/vespa/searchcore/proton/server/ifeedview.h
index d3a43b535dae..8cc5798c2aaa 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ifeedview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ifeedview.h
@@ -29,7 +29,7 @@ class IFeedView
     IFeedView() = default;
 public:
     using SP = std::shared_ptr<IFeedView>;
-    using DoneCallback = const std::shared_ptr<vespalib::IDestructorCallback> &;
+    using DoneCallback = std::shared_ptr<vespalib::IDestructorCallback>;
     using IDestructorCallbackSP = std::shared_ptr<vespalib::IDestructorCallback>;
     using CommitParam = search::CommitParam;
 
@@ -58,12 +58,12 @@ class IFeedView
     virtual void prepareDeleteBucket(DeleteBucketOperation &delOp) = 0;
     [[nodiscard]] virtual bool isMoveStillValid(const MoveOperation & moveOp) const = 0;
     virtual void prepareMove(MoveOperation &putOp) = 0;
-    virtual void handleDeleteBucket(const DeleteBucketOperation &delOp, DoneCallback onDone) = 0;
-    virtual void handleMove(const MoveOperation &putOp, DoneCallback onDone) = 0;
-    virtual void heartBeat(search::SerialNum serialNum, DoneCallback onDone) = 0;
-    virtual void forceCommit(const CommitParam & param, DoneCallback onDone) = 0;
-    virtual void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation & pruneOp, DoneCallback onDone) = 0;
-    virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback onDone) = 0;
+    virtual void handleDeleteBucket(const DeleteBucketOperation &delOp, const DoneCallback& onDone) = 0;
+    virtual void handleMove(const MoveOperation &putOp, const DoneCallback& onDone) = 0;
+    virtual void heartBeat(search::SerialNum serialNum, const DoneCallback& onDone) = 0;
+    virtual void forceCommit(const CommitParam & param, const DoneCallback& onDone) = 0;
+    virtual void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation & pruneOp, const DoneCallback& onDone) = 0;
+    virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback& onDone) = 0;
     void forceCommit(CommitParam param) { forceCommit(param, IDestructorCallbackSP()); }
     void forceCommit(search::SerialNum serialNum) { forceCommit(CommitParam(serialNum)); }
     void forceCommitAndWait(CommitParam param);
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp
index 412596a7848f..fe698c335288 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp
@@ -33,7 +33,7 @@ using ARIConfig = AttributeReprocessingInitializer::Config;
 
 void
 SearchableDocSubDBConfigurer::reconfigureFeedView(std::shared_ptr<IAttributeWriter> attrWriter,
-                                                  std::shared_ptr<Schema> schema,
+                                                  std::shared_ptr<const Schema> schema,
                                                   std::shared_ptr<const DocumentTypeRepo> repo)
 {
     auto curr = _feedView.get();
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h
index 793e011a5db9..27c772dcd995 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h
@@ -51,7 +51,7 @@ class SearchableDocSubDBConfigurer
     uint32_t                     _distributionKey;
 
     void reconfigureFeedView(std::shared_ptr<IAttributeWriter> attrWriter,
-                             std::shared_ptr<search::index::Schema> schema,
+                             std::shared_ptr<const search::index::Schema> schema,
                              std::shared_ptr<const document::DocumentTypeRepo> repo);
 
     void reconfigureMatchView(const std::shared_ptr<searchcorespi::IndexSearchable>& indexSearchable);
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
index 5368265e46b2..9918ac36cb03 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
@@ -41,7 +41,7 @@ SearchableFeedView::~SearchableFeedView() = default;
 
 void
 SearchableFeedView::putIndexedFields(SerialNum serialNum, search::DocumentIdT lid, const DocumentSP &newDoc,
-                                     OnOperationDoneType onWriteDone)
+                                     const OnOperationDoneType& onWriteDone)
 {
     if (!hasIndexedFields()) {
         return;
@@ -53,7 +53,7 @@ SearchableFeedView::putIndexedFields(SerialNum serialNum, search::DocumentIdT li
 }
 
 void
-SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const Document &doc, OnOperationDoneType onWriteDone)
+SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const Document &doc, const OnOperationDoneType& onWriteDone)
 {
     (void) onWriteDone;
     assert(_writeService.index().isCurrentThread());
@@ -65,13 +65,13 @@ SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid
 }
 
 void
-SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const DocumentSP &doc, OnOperationDoneType onWriteDone)
+SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const DocumentSP &doc, const OnOperationDoneType& onWriteDone)
 {
     performIndexPut(serialNum, lid, *doc, onWriteDone);
 }
 
 void
-SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid, FutureDoc futureDoc, OnOperationDoneType onWriteDone)
+SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid, FutureDoc futureDoc, const OnOperationDoneType& onWriteDone)
 {
     const auto &doc = futureDoc.get();
     if (doc) {
@@ -80,7 +80,7 @@ SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid
 }
 
 void
-SearchableFeedView::heartBeatIndexedFields(SerialNum serialNum, DoneCallback onDone)
+SearchableFeedView::heartBeatIndexedFields(SerialNum serialNum, const DoneCallback& onDone)
 {
     _writeService.index().execute(makeLambdaTask([this, serialNum, onDone] {
         (void) onDone;
@@ -95,7 +95,7 @@ SearchableFeedView::performIndexHeartBeat(SerialNum serialNum)
 }
 
 void
-SearchableFeedView::updateIndexedFields(SerialNum serialNum, search::DocumentIdT lid, FutureDoc futureDoc, OnOperationDoneType onWriteDone)
+SearchableFeedView::updateIndexedFields(SerialNum serialNum, search::DocumentIdT lid, FutureDoc futureDoc, const OnOperationDoneType& onWriteDone)
 {
     _writeService.index().execute(
             makeLambdaTask([serialNum, lid, futureDoc = std::move(futureDoc),
@@ -105,7 +105,7 @@ SearchableFeedView::updateIndexedFields(SerialNum serialNum, search::DocumentIdT
 }
 
 void
-SearchableFeedView::removeIndexedFields(SerialNum serialNum, search::DocumentIdT lid, OnRemoveDoneType onWriteDone)
+SearchableFeedView::removeIndexedFields(SerialNum serialNum, search::DocumentIdT lid, const OnRemoveDoneType& onWriteDone)
 {
     if (!hasIndexedFields()) {
         return;
@@ -118,7 +118,7 @@ SearchableFeedView::removeIndexedFields(SerialNum serialNum, search::DocumentIdT
 
 
 void
-SearchableFeedView::performIndexRemove(SerialNum serialNum, search::DocumentIdT lid, OnRemoveDoneType onWriteDone)
+SearchableFeedView::performIndexRemove(SerialNum serialNum, search::DocumentIdT lid, const OnRemoveDoneType& onWriteDone)
 {
     (void) onWriteDone;
     assert(_writeService.index().isCurrentThread());
@@ -130,7 +130,7 @@ SearchableFeedView::performIndexRemove(SerialNum serialNum, search::DocumentIdT
 }
 
 void
-SearchableFeedView::performIndexRemove(SerialNum serialNum, const LidVector &lidsToRemove, OnWriteDoneType onWriteDone)
+SearchableFeedView::performIndexRemove(SerialNum serialNum, const LidVector &lidsToRemove, const OnWriteDoneType& onWriteDone)
 {
     (void) onWriteDone;
     assert(_writeService.index().isCurrentThread());
@@ -145,7 +145,7 @@ SearchableFeedView::performIndexRemove(SerialNum serialNum, const LidVector &lid
 
 void
 SearchableFeedView::removeIndexedFields(SerialNum serialNum, const LidVector &lidsToRemove,
-                                        OnWriteDoneType onWriteDone)
+                                        const OnWriteDoneType& onWriteDone)
 {
     if (!hasIndexedFields())
         return;
@@ -157,20 +157,20 @@ SearchableFeedView::removeIndexedFields(SerialNum serialNum, const LidVector &li
 }
 
 void
-SearchableFeedView::internalDeleteBucket(const DeleteBucketOperation &delOp, DoneCallback onDone)
+SearchableFeedView::internalDeleteBucket(const DeleteBucketOperation &delOp, const DoneCallback& onDone)
 {
     Parent::internalDeleteBucket(delOp, onDone);
 }
 
 void
-SearchableFeedView::performIndexForceCommit(SerialNum serialNum, OnForceCommitDoneType onCommitDone)
+SearchableFeedView::performIndexForceCommit(SerialNum serialNum, const OnForceCommitDoneType& onCommitDone)
 {
     assert(_writeService.index().isCurrentThread());
     _indexWriter->commit(serialNum, onCommitDone);
 }
 
 void
-SearchableFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback onDone)
+SearchableFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback& onDone)
 {
     Parent::handleCompactLidSpace(op, onDone);
     vespalib::Gate gate;
@@ -183,7 +183,7 @@ SearchableFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, Do
 }
 
 void
-SearchableFeedView::internalForceCommit(const CommitParam & param, OnForceCommitDoneType onCommitDone)
+SearchableFeedView::internalForceCommit(const CommitParam & param, const OnForceCommitDoneType& onCommitDone)
 {
     Parent::internalForceCommit(param, onCommitDone);
     _writeService.index().execute(
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h
index 0145bc586f65..fe9e87ba938b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h
@@ -34,23 +34,23 @@ class SearchableFeedView : public FastAccessFeedView
 
     bool hasIndexedFields() const { return _hasIndexedFields; }
 
-    void performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const Document &doc, OnOperationDoneType onWriteDone);
-    void performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const DocumentSP &doc, OnOperationDoneType onWriteDone);
-    void performIndexPut(SerialNum serialNum, search::DocumentIdT lid, FutureDoc doc, OnOperationDoneType onWriteDone);
-    void performIndexRemove(SerialNum serialNum, search::DocumentIdT lid, OnRemoveDoneType onWriteDone);
-    void performIndexRemove(SerialNum serialNum, const LidVector &lidsToRemove, OnWriteDoneType onWriteDone);
+    void performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const Document &doc, const OnOperationDoneType& onWriteDone);
+    void performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const DocumentSP &doc, const OnOperationDoneType& onWriteDone);
+    void performIndexPut(SerialNum serialNum, search::DocumentIdT lid, FutureDoc doc, const OnOperationDoneType& onWriteDone);
+    void performIndexRemove(SerialNum serialNum, search::DocumentIdT lid, const OnRemoveDoneType& onWriteDone);
+    void performIndexRemove(SerialNum serialNum, const LidVector &lidsToRemove, const OnWriteDoneType& onWriteDone);
     void performIndexHeartBeat(SerialNum serialNum);
 
-    void internalDeleteBucket(const DeleteBucketOperation &delOp, DoneCallback onDone) override;
-    void heartBeatIndexedFields(SerialNum serialNum, DoneCallback onDone) override;
+    void internalDeleteBucket(const DeleteBucketOperation &delOp, const DoneCallback& onDone) override;
+    void heartBeatIndexedFields(SerialNum serialNum, const DoneCallback& onDone) override;
 
-    void putIndexedFields(SerialNum serialNum, search::DocumentIdT lid, const DocumentSP &newDoc, OnOperationDoneType onWriteDone) override;
-    void updateIndexedFields(SerialNum serialNum, search::DocumentIdT lid, FutureDoc newDoc, OnOperationDoneType onWriteDone) override;
-    void removeIndexedFields(SerialNum serialNum, search::DocumentIdT lid, OnRemoveDoneType onWriteDone) override;
-    void removeIndexedFields(SerialNum serialNum, const LidVector &lidsToRemove, OnWriteDoneType onWriteDone) override;
+    void putIndexedFields(SerialNum serialNum, search::DocumentIdT lid, const DocumentSP &newDoc, const OnOperationDoneType& onWriteDone) override;
+    void updateIndexedFields(SerialNum serialNum, search::DocumentIdT lid, FutureDoc newDoc, const OnOperationDoneType& onWriteDone) override;
+    void removeIndexedFields(SerialNum serialNum, search::DocumentIdT lid, const OnRemoveDoneType& onWriteDone) override;
+    void removeIndexedFields(SerialNum serialNum, const LidVector &lidsToRemove, const OnWriteDoneType& onWriteDone) override;
 
-    void performIndexForceCommit(SerialNum serialNum, OnForceCommitDoneType onCommitDone);
-    void internalForceCommit(const CommitParam & param, OnForceCommitDoneType onCommitDone) override;
+    void performIndexForceCommit(SerialNum serialNum, const OnForceCommitDoneType& onCommitDone);
+    void internalForceCommit(const CommitParam & param, const OnForceCommitDoneType& onCommitDone) override;
 
 public:
     SearchableFeedView(StoreOnlyFeedView::Context storeOnlyCtx, const PersistentParams &params,
@@ -58,7 +58,7 @@ class SearchableFeedView : public FastAccessFeedView
 
     ~SearchableFeedView() override;
     const IIndexWriter::SP &getIndexWriter() const { return _indexWriter; }
-    void handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback onDone) override;
+    void handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback& onDone) override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
index a4bbfdc3413a..36b76329d2ea 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
@@ -12,6 +12,7 @@
 #include <vespa/searchcore/proton/flushengine/threadedflushtarget.h>
 #include <vespa/searchcore/proton/index/index_manager_initializer.h>
 #include <vespa/searchcore/proton/index/index_writer.h>
+#include <vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h>
 #include <vespa/searchcore/proton/reference/document_db_reference.h>
 #include <vespa/searchcore/proton/reference/gid_to_lid_change_handler.h>
 #include <vespa/searchcore/proton/reference/i_document_db_reference_resolver.h>
@@ -94,10 +95,11 @@ createIndexManagerInitializer(const DocumentDBConfig &configSnapshot, SerialNum
 }
 
 void
-SearchableDocSubDB::setupIndexManager(searchcorespi::IIndexManager::SP indexManager)
+SearchableDocSubDB::setupIndexManager(searchcorespi::IIndexManager::SP indexManager, const Schema& schema)
 {
     _indexMgr = std::move(indexManager);
     _indexWriter = std::make_shared<IndexWriter>(_indexMgr);
+    reconfigure_index_metrics(schema);
 }
 
 DocumentSubDbInitializer::UP
@@ -115,7 +117,7 @@ void
 SearchableDocSubDB::setup(const DocumentSubDbInitializerResult &initResult)
 {
     Parent::setup(initResult);
-    setupIndexManager(initResult.indexManager());
+    setupIndexManager(initResult.indexManager(), *initResult.get_schema());
     _docIdLimit.set(_dms->getCommittedDocIdLimit());
     applyFlushConfig(initResult.getFlushConfig());
 }
@@ -283,7 +285,18 @@ SearchableDocSubDB::getFlushTargetsInternal()
 }
 
 void
-SearchableDocSubDB::setIndexSchema(const Schema::SP &schema, SerialNum serialNum)
+SearchableDocSubDB::reconfigure_index_metrics(const Schema& schema)
+{
+    std::vector<std::string> field_names;
+    field_names.reserve(schema.getNumIndexFields());
+    for (auto& field : schema.getIndexFields()) {
+        field_names.emplace_back(field.getName());
+    }
+    _metricsWireService.set_index_fields(_metrics.ready.index, std::move(field_names));
+}
+
+void
+SearchableDocSubDB::setIndexSchema(std::shared_ptr<const Schema> schema, SerialNum serialNum)
 {
     assert(_writeService.master().isCurrentThread());
 
@@ -292,6 +305,7 @@ SearchableDocSubDB::setIndexSchema(const Schema::SP &schema, SerialNum serialNum
 
     _indexMgr->setSchema(*schema, serialNum);
     reconfigureIndexSearchable();
+    reconfigure_index_metrics(*schema);
 }
 
 size_t
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
index 6986908995c4..92a82a042fd4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
@@ -79,9 +79,10 @@ SearchableDocSubDB : public FastAccessDocSubDB,
                                   const IndexConfig &indexCfg,
                                   std::shared_ptr<searchcorespi::IIndexManager::SP> indexManager) const;
 
-    void setupIndexManager(searchcorespi::IIndexManager::SP indexManager);
+    void setupIndexManager(searchcorespi::IIndexManager::SP indexManager, const Schema& schema);
     void initFeedView(IAttributeWriter::SP attrWriter, const DocumentDBConfig &configSnapshot);
     void reconfigureMatchingMetrics(const vespa::config::search::RankProfilesConfig &config);
+    void reconfigure_index_metrics(const Schema& schema);
 
     bool reconfigure(std::unique_ptr<Configure> configure) override;
     void reconfigureIndexSearchable();
@@ -126,7 +127,7 @@ SearchableDocSubDB : public FastAccessDocSubDB,
 
     SerialNum getOldestFlushedSerial() override;
     SerialNum getNewestFlushedSerial() override;
-    void setIndexSchema(const Schema::SP &schema, SerialNum serialNum) override;
+    void setIndexSchema(std::shared_ptr<const Schema> schema, SerialNum serialNum) override;
     size_t getNumActiveDocs() const override;
     search::SearchableStats getSearchableStats() const override ;
     std::shared_ptr<IDocumentRetriever> getDocumentRetriever() override;
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index 8bf10fe18dc5..a94ee90877f2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -323,6 +323,7 @@ StoreOnlyDocSubDB::createInitializer(const DocumentDBConfig &configSnapshot, Ser
     summaryTask->addDependency(dmsInitTask);
 
     result->writableResult().setFlushConfig(configSnapshot.getMaintenanceConfigSP()->getFlushConfig());
+    result->writableResult().set_schema(configSnapshot.getSchemaSP());
     return result;
 }
 
@@ -537,7 +538,7 @@ StoreOnlyDocSubDB::pruneRemovedFields(SerialNum)
 }
 
 void
-StoreOnlyDocSubDB::setIndexSchema(const Schema::SP &, SerialNum )
+StoreOnlyDocSubDB::setIndexSchema(std::shared_ptr<const Schema>, SerialNum)
 {
     assert(_writeService.master().isCurrentThread());
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h
index a86b8af40d98..182234bb86d8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h
@@ -230,7 +230,7 @@ class StoreOnlyDocSubDB : public DocSubDB
     SerialNum getNewestFlushedSerial() override;
 
     void pruneRemovedFields(SerialNum serialNum) override;
-    void setIndexSchema(const Schema::SP &schema, SerialNum serialNum) override;
+    void setIndexSchema(std::shared_ptr<const Schema> schema, SerialNum serialNum) override;
     search::SearchableStats getSearchableStats() const override;
     std::shared_ptr<IDocumentRetriever> getDocumentRetriever() override;
     matching::MatchingStats getMatcherStats(const std::string &rankProfile) const override;
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index 44f7a8a5e559..fae5c5ed8d8f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -217,7 +217,7 @@ StoreOnlyFeedView::Context::Context(Context &&) noexcept = default;
 StoreOnlyFeedView::Context::~Context() = default;
 
 void
-StoreOnlyFeedView::forceCommit(const CommitParam & param, DoneCallback onDone)
+StoreOnlyFeedView::forceCommit(const CommitParam & param, const DoneCallback& onDone)
 {
     if (useDocumentMetaStore(param.lastSerialNum())) {
         _metaStore.commit(param);
@@ -229,7 +229,7 @@ StoreOnlyFeedView::forceCommit(const CommitParam & param, DoneCallback onDone)
 }
 
 void
-StoreOnlyFeedView::internalForceCommit(const CommitParam & param, OnForceCommitDoneType onCommitDone)
+StoreOnlyFeedView::internalForceCommit(const CommitParam & param, const OnForceCommitDoneType& onCommitDone)
 {
     LOG(debug, "internalForceCommit: serial=%" PRIu64 ".", param.lastSerialNum());
     _writeService.summary().execute(makeLambdaTask([onDone=onCommitDone]() {(void) onDone;}));
@@ -248,10 +248,10 @@ StoreOnlyFeedView::get_pending_lid_token(const DocumentOperation &op)
 }
 
 void
-StoreOnlyFeedView::putAttributes(SerialNum, Lid, const Document &, OnPutDoneType) {}
+StoreOnlyFeedView::putAttributes(SerialNum, Lid, const Document &, const OnPutDoneType&) {}
 
 void
-StoreOnlyFeedView::putIndexedFields(SerialNum, Lid, const std::shared_ptr<Document> &, OnOperationDoneType) {}
+StoreOnlyFeedView::putIndexedFields(SerialNum, Lid, const std::shared_ptr<Document> &, const OnOperationDoneType&) {}
 
 void
 StoreOnlyFeedView::preparePut(PutOperation &putOp)
@@ -318,15 +318,15 @@ StoreOnlyFeedView::internalPut(FeedToken token, const PutOperation &putOp)
 }
 
 void
-StoreOnlyFeedView::heartBeatIndexedFields(SerialNum, DoneCallback ) {}
+StoreOnlyFeedView::heartBeatIndexedFields(SerialNum, const DoneCallback&) {}
 
 
 void
-StoreOnlyFeedView::heartBeatAttributes(SerialNum, DoneCallback ) {}
+StoreOnlyFeedView::heartBeatAttributes(SerialNum, const DoneCallback&) {}
 
 void
 StoreOnlyFeedView::updateAttributes(SerialNum, Lid, const DocumentUpdate & upd,
-                                    OnOperationDoneType, IFieldUpdateCallback & onUpdate)
+                                    const OnOperationDoneType&, IFieldUpdateCallback & onUpdate)
 {
     for (const auto & fieldUpdate : upd.getUpdates()) {
         onUpdate.onUpdateField(fieldUpdate.getField(), nullptr);
@@ -334,12 +334,12 @@ StoreOnlyFeedView::updateAttributes(SerialNum, Lid, const DocumentUpdate & upd,
 }
 
 void
-StoreOnlyFeedView::updateAttributes(SerialNum, Lid, FutureDoc, OnOperationDoneType)
+StoreOnlyFeedView::updateAttributes(SerialNum, Lid, FutureDoc, const OnOperationDoneType&)
 {
 }
 
 void
-StoreOnlyFeedView::updateIndexedFields(SerialNum, Lid, FutureDoc, OnOperationDoneType)
+StoreOnlyFeedView::updateIndexedFields(SerialNum, Lid, FutureDoc, const OnOperationDoneType&)
 {
 }
 
@@ -362,7 +362,7 @@ StoreOnlyFeedView::handleUpdate(FeedToken token, const UpdateOperation &updOp)
 
 void
 StoreOnlyFeedView::putSummary(SerialNum serialNum, Lid lid,
-                              FutureStream futureStream, OnOperationDoneType onDone)
+                              FutureStream futureStream, const OnOperationDoneType& onDone)
 {
     summaryExecutor().execute(
             makeLambdaTask([serialNum, lid, futureStream = std::move(futureStream), trackerToken = _pendingLidsForDocStore.produce(lid), onDone, this] () mutable {
@@ -376,7 +376,7 @@ StoreOnlyFeedView::putSummary(SerialNum serialNum, Lid lid,
 }
 
 void
-StoreOnlyFeedView::putSummaryNoop(FutureStream futureStream, OnOperationDoneType onDone)
+StoreOnlyFeedView::putSummaryNoop(FutureStream futureStream, const OnOperationDoneType& onDone)
 {
     summaryExecutor().execute(
             makeLambdaTask([futureStream = std::move(futureStream), onDone] () mutable {
@@ -387,7 +387,7 @@ StoreOnlyFeedView::putSummaryNoop(FutureStream futureStream, OnOperationDoneType
 }
 
 void
-StoreOnlyFeedView::putSummary(SerialNum serialNum, Lid lid, Document::SP doc, OnOperationDoneType onDone)
+StoreOnlyFeedView::putSummary(SerialNum serialNum, Lid lid, Document::SP doc, const OnOperationDoneType& onDone)
 {
     summaryExecutor().execute(
             makeLambdaTask([serialNum, doc = std::move(doc), trackerToken = _pendingLidsForDocStore.produce(lid), onDone, lid, this] {
@@ -397,7 +397,7 @@ StoreOnlyFeedView::putSummary(SerialNum serialNum, Lid lid, Document::SP doc, On
             }));
 }
 void
-StoreOnlyFeedView::removeSummary(SerialNum serialNum, Lid lid, OnWriteDoneType onDone) {
+StoreOnlyFeedView::removeSummary(SerialNum serialNum, Lid lid, const OnWriteDoneType& onDone) {
     summaryExecutor().execute(
             makeLambdaTask([serialNum, lid, onDone, trackerToken = _pendingLidsForDocStore.produce(lid), this] {
                 (void) onDone;
@@ -406,7 +406,7 @@ StoreOnlyFeedView::removeSummary(SerialNum serialNum, Lid lid, OnWriteDoneType o
             }));
 }
 void
-StoreOnlyFeedView::removeSummaries(SerialNum serialNum, const LidVector & lids, OnWriteDoneType onDone) {
+StoreOnlyFeedView::removeSummaries(SerialNum serialNum, const LidVector & lids, const OnWriteDoneType& onDone) {
     std::vector<IPendingLidTracker::Token> trackerTokens;
     trackerTokens.reserve(lids.size());
     std::for_each(lids.begin(), lids.end(), [this, &trackerTokens](Lid lid) {
@@ -423,7 +423,7 @@ StoreOnlyFeedView::removeSummaries(SerialNum serialNum, const LidVector & lids,
 }
 
 void
-StoreOnlyFeedView::heartBeatSummary(SerialNum serialNum, DoneCallback onDone) {
+StoreOnlyFeedView::heartBeatSummary(SerialNum serialNum, const DoneCallback& onDone) {
     summaryExecutor().execute(
             makeLambdaTask([serialNum, this, onDone] {
                 (void) onDone;
@@ -541,10 +541,10 @@ StoreOnlyFeedView::lookupDocId(const DocumentId &docId, Lid &lid) const
 }
 
 void
-StoreOnlyFeedView::removeAttributes(SerialNum, Lid, OnRemoveDoneType) {}
+StoreOnlyFeedView::removeAttributes(SerialNum, Lid, const OnRemoveDoneType&) {}
 
 void
-StoreOnlyFeedView::removeIndexedFields(SerialNum, Lid, OnRemoveDoneType) {}
+StoreOnlyFeedView::removeIndexedFields(SerialNum, Lid, const OnRemoveDoneType&) {}
 
 void
 StoreOnlyFeedView::prepareRemove(RemoveOperation &rmOp)
@@ -648,13 +648,13 @@ StoreOnlyFeedView::adjustMetaStore(const DocumentOperation &op, const GlobalId &
 }
 
 void
-StoreOnlyFeedView::removeAttributes(SerialNum, const LidVector &, OnWriteDoneType ) {}
+StoreOnlyFeedView::removeAttributes(SerialNum, const LidVector &, const OnWriteDoneType&) {}
 
 void
-StoreOnlyFeedView::removeIndexedFields(SerialNum , const LidVector &, OnWriteDoneType ) {}
+StoreOnlyFeedView::removeIndexedFields(SerialNum , const LidVector &, const OnWriteDoneType&) {}
 
 size_t
-StoreOnlyFeedView::removeDocuments(const RemoveDocumentsOperation &op, bool remove_index_and_attributes, DoneCallback onWriteDone)
+StoreOnlyFeedView::removeDocuments(const RemoveDocumentsOperation &op, bool remove_index_and_attributes, const DoneCallback& onWriteDone)
 {
     const SerialNum serialNum = op.getSerialNum();
     const LidVectorContext::SP &ctx = op.getLidsToRemove(_params._subDbId);
@@ -697,13 +697,13 @@ StoreOnlyFeedView::prepareDeleteBucket(DeleteBucketOperation &delOp)
 }
 
 void
-StoreOnlyFeedView::handleDeleteBucket(const DeleteBucketOperation &delOp, DoneCallback onDone)
+StoreOnlyFeedView::handleDeleteBucket(const DeleteBucketOperation &delOp, const DoneCallback& onDone)
 {
     internalDeleteBucket(delOp, onDone);
 }
 
 void
-StoreOnlyFeedView::internalDeleteBucket(const DeleteBucketOperation &delOp, DoneCallback onDone)
+StoreOnlyFeedView::internalDeleteBucket(const DeleteBucketOperation &delOp, const DoneCallback& onDone)
 {
     size_t rm_count = removeDocuments(delOp, true, onDone);
     LOG(debug, "internalDeleteBucket(): docType(%s), bucket(%s), lidsToRemove(%zu)",
@@ -732,7 +732,7 @@ StoreOnlyFeedView::prepareMove(MoveOperation &moveOp)
 
 // CombiningFeedView calls this for both source and target subdb.
 void
-StoreOnlyFeedView::handleMove(const MoveOperation &moveOp, DoneCallback doneCtx)
+StoreOnlyFeedView::handleMove(const MoveOperation &moveOp, const DoneCallback& doneCtx)
 {
     assert(moveOp.getValidDbdId());
     assert(moveOp.getValidPrevDbdId());
@@ -766,7 +766,7 @@ StoreOnlyFeedView::handleMove(const MoveOperation &moveOp, DoneCallback doneCtx)
 }
 
 void
-StoreOnlyFeedView::heartBeat(SerialNum serialNum, DoneCallback onDone)
+StoreOnlyFeedView::heartBeat(SerialNum serialNum, const DoneCallback& onDone)
 {
     assert(_writeService.master().isCurrentThread());
     _metaStore.reclaim_unused_memory();
@@ -779,7 +779,7 @@ StoreOnlyFeedView::heartBeat(SerialNum serialNum, DoneCallback onDone)
 // CombiningFeedView calls this only for the removed subdb.
 void
 StoreOnlyFeedView::
-handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp, DoneCallback onDone)
+handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp, const DoneCallback& onDone)
 {
     assert(_params._subDbType == SubDbType::REMOVED);
     assert(pruneOp.getSubDbId() == _params._subDbId);
@@ -791,7 +791,7 @@ handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp, DoneC
 }
 
 void
-StoreOnlyFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback onDone)
+StoreOnlyFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback& onDone)
 {
     assert(_params._subDbId == op.getSubDbId());
     const SerialNum serialNum = op.getSerialNum();
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
index 0e1a4e09482a..c500b6b3dffe 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
@@ -54,10 +54,10 @@ class StoreOnlyFeedView : public IFeedView,
     using Document = document::Document;
     using DocumentUpdate = document::DocumentUpdate;
     using OnWriteDoneType = DoneCallback;
-    using OnForceCommitDoneType =const std::shared_ptr<ForceCommitContext> &;
-    using OnOperationDoneType = const std::shared_ptr<OperationDoneContext> &;
-    using OnPutDoneType = const std::shared_ptr<PutDoneContext> &;
-    using OnRemoveDoneType = const std::shared_ptr<RemoveDoneContext> &;
+    using OnForceCommitDoneType = std::shared_ptr<ForceCommitContext>;
+    using OnOperationDoneType = std::shared_ptr<OperationDoneContext>;
+    using OnPutDoneType = std::shared_ptr<PutDoneContext>;
+    using OnRemoveDoneType = std::shared_ptr<RemoveDoneContext>;
     using FutureDoc = std::shared_future<std::unique_ptr<const Document>>;
     using PromisedDoc = std::promise<std::unique_ptr<const Document>>;
     using FutureStream = std::future<vespalib::nbostream>;
@@ -71,7 +71,7 @@ class StoreOnlyFeedView : public IFeedView,
     struct Context
     {
         ISummaryAdapter::SP                                _summaryAdapter;
-        search::index::Schema::SP                          _schema;
+        std::shared_ptr<const search::index::Schema>       _schema;
         IDocumentMetaStoreContext::SP                      _documentMetaStoreContext;
         std::shared_ptr<const document::DocumentTypeRepo>  _repo;
         std::shared_ptr<PendingLidTrackerBase>             _pendingLidsForCommit;
@@ -79,7 +79,7 @@ class StoreOnlyFeedView : public IFeedView,
         searchcorespi::index::IThreadingService           &_writeService;
 
         Context(ISummaryAdapter::SP summaryAdapter,
-                search::index::Schema::SP schema,
+                std::shared_ptr<const search::index::Schema> schema,
                 IDocumentMetaStoreContext::SP documentMetaStoreContext,
                 std::shared_ptr<const document::DocumentTypeRepo> repo,
                 std::shared_ptr<PendingLidTrackerBase> pendingLidsForCommit,
@@ -126,7 +126,7 @@ class StoreOnlyFeedView : public IFeedView,
     LidReuseDelayer                                          _lidReuseDelayer;
     PendingLidTracker                                        _pendingLidsForDocStore;
     std::shared_ptr<PendingLidTrackerBase>                   _pendingLidsForCommit;
-    const search::index::Schema::SP                          _schema;
+    const std::shared_ptr<const search::index::Schema>       _schema;
     vespalib::hash_set<int32_t>                              _indexedFields;
 protected:
     searchcorespi::index::IThreadingService &_writeService;
@@ -138,12 +138,12 @@ class StoreOnlyFeedView : public IFeedView,
     vespalib::Executor & summaryExecutor() {
         return _writeService.summary();
     }
-    void putSummary(SerialNum serialNum, Lid lid, FutureStream doc, OnOperationDoneType onDone);
-    void putSummaryNoop(FutureStream doc, OnOperationDoneType onDone);
-    void putSummary(SerialNum serialNum, Lid lid, DocumentSP doc, OnOperationDoneType onDone);
-    void removeSummary(SerialNum serialNum, Lid lid, OnWriteDoneType onDone);
-    void removeSummaries(SerialNum serialNum, const LidVector & lids, OnWriteDoneType onDone);
-    void heartBeatSummary(SerialNum serialNum, DoneCallback onDone);
+    void putSummary(SerialNum serialNum, Lid lid, FutureStream doc, const OnOperationDoneType& onDone);
+    void putSummaryNoop(FutureStream doc, const OnOperationDoneType& onDone);
+    void putSummary(SerialNum serialNum, Lid lid, DocumentSP doc, const OnOperationDoneType& onDone);
+    void removeSummary(SerialNum serialNum, Lid lid, const OnWriteDoneType& onDone);
+    void removeSummaries(SerialNum serialNum, const LidVector & lids, const OnWriteDoneType& onDone);
+    void heartBeatSummary(SerialNum serialNum, const DoneCallback& onDone);
 
     bool useDocumentStore(SerialNum replaySerialNum) const {
         return replaySerialNum > _params._flushedDocumentStoreSerialNum;
@@ -162,7 +162,7 @@ class StoreOnlyFeedView : public IFeedView,
 
     // Removes documents from meta store and document store.
     // returns the number of documents removed.
-    size_t removeDocuments(const RemoveDocumentsOperation &op, bool remove_index_and_attribute_fields, DoneCallback onDone);
+    size_t removeDocuments(const RemoveDocumentsOperation &op, bool remove_index_and_attribute_fields, const DoneCallback& onDone);
 
     void internalRemove(FeedToken token, std::shared_ptr<vespalib::IDestructorCallback> done_callback,IPendingLidTracker::Token uncommitted, SerialNum serialNum, Lid lid);
 
@@ -172,32 +172,32 @@ class StoreOnlyFeedView : public IFeedView,
                              PromisedDoc promisedDoc, PromisedStream promisedStream);
 
 protected:
-    virtual void internalDeleteBucket(const DeleteBucketOperation &delOp, DoneCallback onDone);
-    virtual void heartBeatIndexedFields(SerialNum serialNum, DoneCallback onDone);
-    virtual void heartBeatAttributes(SerialNum serialNum, DoneCallback onDone);
+    virtual void internalDeleteBucket(const DeleteBucketOperation &delOp, const DoneCallback& onDone);
+    virtual void heartBeatIndexedFields(SerialNum serialNum, const DoneCallback& onDone);
+    virtual void heartBeatAttributes(SerialNum serialNum, const DoneCallback& onDone);
 
 private:
-    virtual void putAttributes(SerialNum serialNum, Lid lid, const Document &doc, OnPutDoneType onWriteDone);
-    virtual void putIndexedFields(SerialNum serialNum, Lid lid, const DocumentSP &newDoc, OnOperationDoneType onWriteDone);
+    virtual void putAttributes(SerialNum serialNum, Lid lid, const Document &doc, const OnPutDoneType& onWriteDone);
+    virtual void putIndexedFields(SerialNum serialNum, Lid lid, const DocumentSP &newDoc, const OnOperationDoneType& onWriteDone);
 
     virtual void updateAttributes(SerialNum serialNum, Lid lid, const DocumentUpdate &upd,
-                                  OnOperationDoneType onWriteDone, IFieldUpdateCallback & onUpdate);
+                                  const OnOperationDoneType& onWriteDone, IFieldUpdateCallback & onUpdate);
 
-    virtual void updateAttributes(SerialNum serialNum, Lid lid, FutureDoc doc, OnOperationDoneType onWriteDone);
-    virtual void updateIndexedFields(SerialNum serialNum, Lid lid, FutureDoc doc, OnOperationDoneType onWriteDone);
-    virtual void removeAttributes(SerialNum serialNum, Lid lid, OnRemoveDoneType onWriteDone);
-    virtual void removeIndexedFields(SerialNum serialNum, Lid lid, OnRemoveDoneType onWriteDone);
+    virtual void updateAttributes(SerialNum serialNum, Lid lid, FutureDoc doc, const OnOperationDoneType& onWriteDone);
+    virtual void updateIndexedFields(SerialNum serialNum, Lid lid, FutureDoc doc, const OnOperationDoneType& onWriteDone);
+    virtual void removeAttributes(SerialNum serialNum, Lid lid, const OnRemoveDoneType& onWriteDone);
+    virtual void removeIndexedFields(SerialNum serialNum, Lid lid, const OnRemoveDoneType& onWriteDone);
 
 protected:
-    virtual void removeAttributes(SerialNum serialNum, const LidVector &lidsToRemove, OnWriteDoneType onWriteDone);
-    virtual void removeIndexedFields(SerialNum serialNum, const LidVector &lidsToRemove, OnWriteDoneType onWriteDone);
-    virtual void internalForceCommit(const CommitParam & param, OnForceCommitDoneType onCommitDone);
+    virtual void removeAttributes(SerialNum serialNum, const LidVector &lidsToRemove, const OnWriteDoneType& onWriteDone);
+    virtual void removeIndexedFields(SerialNum serialNum, const LidVector &lidsToRemove, const OnWriteDoneType& onWriteDone);
+    virtual void internalForceCommit(const CommitParam & param, const OnForceCommitDoneType& onCommitDone);
 public:
     StoreOnlyFeedView(Context ctx, const PersistentParams &params);
     ~StoreOnlyFeedView() override;
 
     const ISummaryAdapter::SP &getSummaryAdapter() const { return _summaryAdapter; }
-    const search::index::Schema::SP &getSchema() const { return _schema; }
+    const std::shared_ptr<const search::index::Schema> &getSchema() const noexcept { return _schema; }
     const PersistentParams &getPersistentParams() const { return _params; }
     const search::IDocumentStore &getDocumentStore() const { return _summaryAdapter->getDocumentStore(); }
     const IDocumentMetaStoreContext::SP &getDocumentMetaStore() const { return _documentMetaStoreContext; }
@@ -214,12 +214,12 @@ class StoreOnlyFeedView : public IFeedView,
     void prepareRemove(RemoveOperation &rmOp) override;
     void handleRemove(FeedToken token, const RemoveOperation &rmOp) override;
     void prepareDeleteBucket(DeleteBucketOperation &delOp) override;
-    void handleDeleteBucket(const DeleteBucketOperation &delOp, DoneCallback onDone) override;
+    void handleDeleteBucket(const DeleteBucketOperation &delOp, const DoneCallback& onDone) override;
     bool isMoveStillValid(const MoveOperation & moveOp) const override;
     void prepareMove(MoveOperation &putOp) override;
-    void handleMove(const MoveOperation &putOp, DoneCallback doneCtx) override;
-    void heartBeat(search::SerialNum serialNum, DoneCallback onDone) override;
-    void forceCommit(const CommitParam & param, DoneCallback onDone) override;
+    void handleMove(const MoveOperation &putOp, const DoneCallback& doneCtx) override;
+    void heartBeat(search::SerialNum serialNum, const DoneCallback& onDone) override;
+    void forceCommit(const CommitParam & param, const DoneCallback& onDone) override;
 
     /**
      * Prune lids present in operation.  Caller must call doneSegment()
@@ -227,8 +227,8 @@ class StoreOnlyFeedView : public IFeedView,
      *
      * Called by writer thread.
      */
-    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp, DoneCallback onDone) override;
-    void handleCompactLidSpace(const CompactLidSpaceOperation &op, DoneCallback onDone) override;
+    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp, const DoneCallback& onDone) override;
+    void handleCompactLidSpace(const CompactLidSpaceOperation &op, const DoneCallback& onDone) override;
     std::shared_ptr<PendingLidTrackerBase> getUncommittedLidTracker() { return _pendingLidsForCommit; }
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp
index c2da87fd9cfc..789e893b0358 100644
--- a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp
@@ -26,7 +26,7 @@ using proton::ThreadingServiceConfig;
 namespace proton::test {
 
 DocumentDBConfigBuilder::DocumentDBConfigBuilder(int64_t generation,
-                                                 const search::index::Schema::SP &schema,
+                                                 std::shared_ptr<const search::index::Schema> schema,
                                                  const std::string &configId,
                                                  const std::string &docTypeName)
     : _generation(generation),
@@ -42,7 +42,7 @@ DocumentDBConfigBuilder::DocumentDBConfigBuilder(int64_t generation,
       _repo(std::make_shared<document::DocumentTypeRepo>()),
       _importedFields(std::make_shared<ImportedFieldsConfig>()),
       _tuneFileDocumentDB(std::make_shared<TuneFileDocumentDB>()),
-      _schema(schema),
+      _schema(std::move(schema)),
       _maintenance(std::make_shared<DocumentDBMaintenanceConfig>()),
       _store(),
       _threading_service_config(ThreadingServiceConfig::make()),
diff --git a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.h b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.h
index 7a1a3951ebed..3924febf9553 100644
--- a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.h
+++ b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.h
@@ -27,7 +27,7 @@ class DocumentDBConfigBuilder {
     std::shared_ptr<const document::DocumentTypeRepo> _repo;
     DocumentDBConfig::ImportedFieldsConfigSP _importedFields;
     search::TuneFileDocumentDB::SP _tuneFileDocumentDB;
-    search::index::Schema::SP _schema;
+    std::shared_ptr<const search::index::Schema> _schema;
     DocumentDBConfig::MaintenanceConfigSP _maintenance;
     search::LogDocumentStore::Config _store;
     const ThreadingServiceConfig _threading_service_config;
@@ -37,7 +37,7 @@ class DocumentDBConfigBuilder {
 
 public:
     DocumentDBConfigBuilder(int64_t generation,
-                            const search::index::Schema::SP &schema,
+                            std::shared_ptr<const search::index::Schema> schema,
                             const std::string &configId,
                             const std::string &docTypeName);
     ~DocumentDBConfigBuilder();
diff --git a/searchcore/src/vespa/searchcore/proton/test/dummy_document_sub_db.h b/searchcore/src/vespa/searchcore/proton/test/dummy_document_sub_db.h
index 990852d843d4..7155e120a12f 100644
--- a/searchcore/src/vespa/searchcore/proton/test/dummy_document_sub_db.h
+++ b/searchcore/src/vespa/searchcore/proton/test/dummy_document_sub_db.h
@@ -73,7 +73,7 @@ struct DummyDocumentSubDb : public IDocumentSubDB
     SerialNum getOldestFlushedSerial() override { return 0; }
     SerialNum getNewestFlushedSerial() override { return 0; }
     void pruneRemovedFields(SerialNum) override { }
-    void setIndexSchema(const Schema::SP &, SerialNum) override { }
+    void setIndexSchema(std::shared_ptr<const Schema>, SerialNum) override { }
     search::SearchableStats getSearchableStats() const override {
         return {};
     }
diff --git a/searchcore/src/vespa/searchcore/proton/test/dummy_feed_view.h b/searchcore/src/vespa/searchcore/proton/test/dummy_feed_view.h
index 751d4464ca7b..9d9dedeae036 100644
--- a/searchcore/src/vespa/searchcore/proton/test/dummy_feed_view.h
+++ b/searchcore/src/vespa/searchcore/proton/test/dummy_feed_view.h
@@ -25,14 +25,14 @@ struct DummyFeedView : public IFeedView
     void prepareRemove(RemoveOperation &) override {}
     void handleRemove(FeedToken, const RemoveOperation &) override {}
     void prepareDeleteBucket(DeleteBucketOperation &) override {}
-    void handleDeleteBucket(const DeleteBucketOperation &, DoneCallback) override {}
+    void handleDeleteBucket(const DeleteBucketOperation &, const DoneCallback&) override {}
     bool isMoveStillValid(const MoveOperation &) const override { return true; }
     void prepareMove(MoveOperation &) override {}
-    void handleMove(const MoveOperation &, DoneCallback) override {}
-    void heartBeat(search::SerialNum, DoneCallback) override {}
-    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &, DoneCallback) override {}
-    void handleCompactLidSpace(const CompactLidSpaceOperation &, DoneCallback) override {}
-    void forceCommit(const CommitParam &, DoneCallback) override { }
+    void handleMove(const MoveOperation &, const DoneCallback&) override {}
+    void heartBeat(search::SerialNum, const DoneCallback&) override {}
+    void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &, const DoneCallback&) override {}
+    void handleCompactLidSpace(const CompactLidSpaceOperation &, const DoneCallback&) override {}
+    void forceCommit(const CommitParam &, const DoneCallback&) override { }
 };
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_index_manager.h b/searchcore/src/vespa/searchcore/proton/test/mock_index_manager.h
index a9f386bfc123..53af2381e7fe 100644
--- a/searchcore/src/vespa/searchcore/proton/test/mock_index_manager.h
+++ b/searchcore/src/vespa/searchcore/proton/test/mock_index_manager.h
@@ -11,9 +11,9 @@ namespace proton::test {
 struct MockIndexManager : public searchcorespi::IIndexManager
 {
     ~MockIndexManager() override;
-    void putDocument(uint32_t, const Document &, SerialNum, OnWriteDoneType) override {}
+    void putDocument(uint32_t, const Document &, SerialNum, const OnWriteDoneType&) override {}
     void removeDocuments(LidVector, SerialNum) override {}
-    void commit(SerialNum, OnWriteDoneType) override {}
+    void commit(SerialNum, const OnWriteDoneType&) override {}
     SerialNum getCurrentSerialNum() const override { return 0; }
     SerialNum getFlushedSerialNum() const override { return 0; }
     searchcorespi::IndexSearchable::SP getSearchable() const override {
diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_index_writer.h b/searchcore/src/vespa/searchcore/proton/test/mock_index_writer.h
index f9b40a489530..4123e6e39b61 100644
--- a/searchcore/src/vespa/searchcore/proton/test/mock_index_writer.h
+++ b/searchcore/src/vespa/searchcore/proton/test/mock_index_writer.h
@@ -14,9 +14,9 @@ struct MockIndexWriter : public IIndexWriter
     MockIndexWriter() : _idxMgr() {}
     MockIndexWriter(const IIndexManager::SP &idxMgr) : _idxMgr(idxMgr) {}
     const IIndexManager::SP &getIndexManager() const override { return _idxMgr; }
-    void put(search::SerialNum, const document::Document &, const search::DocumentIdT, OnWriteDoneType) override {}
+    void put(search::SerialNum, const document::Document &, const search::DocumentIdT, const OnWriteDoneType&) override {}
     void removeDocs(search::SerialNum, LidVector) override {}
-    void commit(search::SerialNum, OnWriteDoneType) override {}
+    void commit(search::SerialNum, const OnWriteDoneType&) override {}
     void heartBeat(search::SerialNum) override {}
     void compactLidSpace(search::SerialNum, const search::DocumentIdT) override {}
 };
diff --git a/searchcore/src/vespa/searchcorespi/index/iindexmanager.h b/searchcore/src/vespa/searchcorespi/index/iindexmanager.h
index b6bbe416562a..a54dc422f645 100644
--- a/searchcore/src/vespa/searchcorespi/index/iindexmanager.h
+++ b/searchcore/src/vespa/searchcorespi/index/iindexmanager.h
@@ -35,7 +35,7 @@ class IIndexManager {
     using Schema = search::index::Schema;
     using LidVector = std::vector<uint32_t>;
 public:
-    using OnWriteDoneType = const std::shared_ptr<vespalib::IDestructorCallback> &;
+    using OnWriteDoneType = std::shared_ptr<vespalib::IDestructorCallback>;
 
     struct Configure {
         virtual ~Configure() = default;
@@ -97,7 +97,7 @@ class IIndexManager {
      * @param on_write_done   shared object that notifies write done when
      *                        destructed.
      **/
-    virtual void putDocument(uint32_t lid, const Document &doc, SerialNum serialNum, OnWriteDoneType on_write_done) = 0;
+    virtual void putDocument(uint32_t lid, const Document &doc, SerialNum serialNum, const OnWriteDoneType& on_write_done) = 0;
 
     /**
      * Removes the given document from the index. This method is
@@ -130,7 +130,7 @@ class IIndexManager {
      * @param onWriteDone     shared object that notifies write done when
      *                        destructed.
      **/
-    virtual void commit(SerialNum serialNum, OnWriteDoneType onWriteDone) = 0;
+    virtual void commit(SerialNum serialNum, const OnWriteDoneType& onWriteDone) = 0;
 
     /**
      * This method is called on a regular basis to update each component with what is the highest
diff --git a/searchcore/src/vespa/searchcorespi/index/imemoryindex.h b/searchcore/src/vespa/searchcorespi/index/imemoryindex.h
index d9a13e24a1aa..d3fdf2dd9420 100644
--- a/searchcore/src/vespa/searchcorespi/index/imemoryindex.h
+++ b/searchcore/src/vespa/searchcorespi/index/imemoryindex.h
@@ -18,7 +18,7 @@ namespace searchcorespi::index {
 struct IMemoryIndex : public searchcorespi::IndexSearchable {
     using LidVector = std::vector<uint32_t>;
     using SP = std::shared_ptr<IMemoryIndex>;
-    using OnWriteDoneType = const std::shared_ptr<vespalib::IDestructorCallback> &;
+    using OnWriteDoneType = std::shared_ptr<vespalib::IDestructorCallback>;
     virtual ~IMemoryIndex() {}
 
     /**
@@ -44,7 +44,7 @@ struct IMemoryIndex : public searchcorespi::IndexSearchable {
      * @param doc the document to insert.
      * @param on_write_done shared object that notifies write done when destructed.
      */
-    virtual void insertDocument(uint32_t lid, const document::Document &doc, OnWriteDoneType on_write_done) = 0;
+    virtual void insertDocument(uint32_t lid, const document::Document &doc, const OnWriteDoneType& on_write_done) = 0;
 
     /**
      * Removes the given document from this memory index.
@@ -61,7 +61,7 @@ struct IMemoryIndex : public searchcorespi::IndexSearchable {
     /**
      * Commits the inserts and removes since the last commit, making them searchable.
      **/
-    virtual void commit(OnWriteDoneType onWriteDone, search::SerialNum serialNum) = 0;
+    virtual void commit(const OnWriteDoneType& onWriteDone, search::SerialNum serialNum) = 0;
 
     /**
      * Flushes this memory index to disk as a disk index.
@@ -78,7 +78,7 @@ struct IMemoryIndex : public searchcorespi::IndexSearchable {
                              search::SerialNum serialNum) = 0;
 
     virtual void pruneRemovedFields(const search::index::Schema &schema) = 0;
-    virtual search::index::Schema::SP getPrunedSchema() const = 0;
+    virtual std::shared_ptr<const search::index::Schema> getPrunedSchema() const = 0;
 
     virtual void insert_write_context_state(vespalib::slime::Cursor& object) const = 0;
 };
diff --git a/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp
index 1ab09c0e0495..f0300a1c4827 100644
--- a/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp
+++ b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp
@@ -269,9 +269,9 @@ IndexMaintainer::updateActiveFusionPrunedSchema(const Schema &schema)
 {
     assert(_ctx.getThreadingService().master().isCurrentThread());
     for (;;) {
-        std::shared_ptr<Schema> activeFusionSchema;
-        std::shared_ptr<Schema> activeFusionPrunedSchema;
-        std::shared_ptr<Schema> newActiveFusionPrunedSchema;
+        std::shared_ptr<const Schema> activeFusionSchema;
+        std::shared_ptr<const Schema> activeFusionPrunedSchema;
+        std::shared_ptr<const Schema> newActiveFusionPrunedSchema;
         {
             LockGuard lock(_state_lock);
             activeFusionSchema = _activeFusionSchema;
@@ -822,7 +822,7 @@ IndexMaintainer::getSchema(void) const
     return _schema;
 }
 
-std::shared_ptr<Schema>
+std::shared_ptr<const Schema>
 IndexMaintainer::getActiveFusionPrunedSchema(void) const
 {
     LockGuard lock(_index_update_lock);
@@ -1203,7 +1203,7 @@ IndexMaintainer::getNumFrozenMemoryIndexes(void) const
 }
 
 void
-IndexMaintainer::putDocument(uint32_t lid, const Document &doc, SerialNum serialNum, OnWriteDoneType on_write_done)
+IndexMaintainer::putDocument(uint32_t lid, const Document &doc, SerialNum serialNum, const OnWriteDoneType& on_write_done)
 {
     assert(_ctx.getThreadingService().index().isCurrentThread());
     LockGuard lock(_index_update_lock);
@@ -1254,7 +1254,7 @@ IndexMaintainer::commit(vespalib::Gate& gate)
 }
 
 void
-IndexMaintainer::commit(SerialNum serialNum, OnWriteDoneType onWriteDone)
+IndexMaintainer::commit(SerialNum serialNum, const OnWriteDoneType& onWriteDone)
 {
     assert(_ctx.getThreadingService().index().isCurrentThread());
     LockGuard lock(_index_update_lock);
diff --git a/searchcore/src/vespa/searchcorespi/index/indexmaintainer.h b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.h
index ff6a6a791333..89ded5fd2866 100644
--- a/searchcore/src/vespa/searchcorespi/index/indexmaintainer.h
+++ b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.h
@@ -76,9 +76,9 @@ class IndexMaintainer : public IIndexManager,
     std::shared_ptr<DiskIndexes>  _disk_indexes;
     IndexDiskLayout        _layout;
     Schema                  _schema;             // Protected by SL + IUL
-    std::shared_ptr<Schema> _activeFusionSchema; // Protected by SL + IUL
+    std::shared_ptr<const Schema> _activeFusionSchema; // Protected by SL + IUL
     // Protected by SL + IUL
-    std::shared_ptr<Schema> _activeFusionPrunedSchema;
+    std::shared_ptr<const Schema> _activeFusionPrunedSchema;
     uint32_t               _source_selector_changes; // Protected by IUL
     // _selector is protected by SL + IUL
     std::shared_ptr<ISourceSelector> _selector;
@@ -196,7 +196,7 @@ class IndexMaintainer : public IIndexManager,
         // or data structure limitations).
         FrozenMemoryIndexRefs _extraIndexes;
         ChangeGens _changeGens;
-        std::shared_ptr<Schema> _prunedSchema;
+        std::shared_ptr<const Schema> _prunedSchema;
 
         FlushArgs();
         FlushArgs(const FlushArgs &) = delete;
@@ -222,7 +222,7 @@ class IndexMaintainer : public IIndexManager,
         uint32_t   _new_fusion_id;
         ChangeGens _changeGens;
         Schema     _schema;
-        std::shared_ptr<Schema> _prunedSchema;
+        std::shared_ptr<const Schema> _prunedSchema;
         std::shared_ptr<ISearchableIndexCollection> _old_source_list; // Delays destruction
 
         FusionArgs();
@@ -247,7 +247,7 @@ class IndexMaintainer : public IIndexManager,
     void doneSetSchema(SetSchemaArgs &args, std::shared_ptr<IMemoryIndex>& newIndex, SerialNum serial_num);
 
     Schema getSchema(void) const;
-    std::shared_ptr<Schema> getActiveFusionPrunedSchema() const;
+    std::shared_ptr<const Schema> getActiveFusionPrunedSchema() const;
     search::TuneFileAttributes getAttrTune();
     ChangeGens getChangeGens();
 
@@ -337,9 +337,9 @@ class IndexMaintainer : public IIndexManager,
     vespalib::system_time getLastFlushTime() const { return _lastFlushTime; }
 
     // Implements IIndexManager
-    void putDocument(uint32_t lid, const Document &doc, SerialNum serialNum, OnWriteDoneType on_write_done) override;
+    void putDocument(uint32_t lid, const Document &doc, SerialNum serialNum, const OnWriteDoneType& on_write_done) override;
     void removeDocuments(LidVector lids, SerialNum serialNum) override;
-    void commit(SerialNum serialNum, OnWriteDoneType onWriteDone) override;
+    void commit(SerialNum serialNum, const OnWriteDoneType& onWriteDone) override;
     void heartBeat(search::SerialNum serialNum) override;
     void compactLidSpace(uint32_t lidLimit, SerialNum serialNum) override;
 
diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json
index 7d06db8971c3..3163075359d9 100644
--- a/searchlib/abi-spec.json
+++ b/searchlib/abi-spec.json
@@ -865,6 +865,21 @@
       "protected int maxNextCharInd"
     ]
   },
+  "com.yahoo.searchlib.rankingexpression.parser.CellMapHelper" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
+      "public"
+    ],
+    "methods" : [
+      "public void <init>(com.yahoo.tensor.TensorType, java.util.List)",
+      "public java.util.Map map()",
+      "public com.yahoo.searchlib.rankingexpression.parser.CellMapHelper bind(java.lang.String)",
+      "public void handleScalar(com.yahoo.searchlib.rankingexpression.rule.ExpressionNode)",
+      "public void handleDenseSubspace(java.util.List)"
+    ],
+    "fields" : [ ]
+  },
   "com.yahoo.searchlib.rankingexpression.parser.CharStream" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [ ],
@@ -979,10 +994,11 @@
       "public final com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode tensorValueBody(com.yahoo.tensor.TensorType, java.util.List)",
       "public final com.yahoo.tensor.functions.DynamicTensor mappedTensorValueBody(com.yahoo.tensor.TensorType)",
       "public final com.yahoo.tensor.functions.DynamicTensor mixedTensorValueBody(com.yahoo.tensor.TensorType, java.util.List)",
+      "public final void mixedValueObject(com.yahoo.searchlib.rankingexpression.parser.CellMapHelper)",
       "public final com.yahoo.tensor.functions.DynamicTensor indexedTensorValueBody(com.yahoo.tensor.TensorType, java.util.List)",
-      "public final void keyValueOrMixedBlock(com.yahoo.tensor.TensorType, java.util.List, java.util.Map)",
-      "public final void keyValue(com.yahoo.tensor.TensorType, java.util.Map)",
-      "public final void mixedBlock(com.yahoo.tensor.TensorType, java.util.List, java.util.Map)",
+      "public final void keyValueOrMixedBlock(com.yahoo.searchlib.rankingexpression.parser.CellMapHelper)",
+      "public final void keyValue(com.yahoo.searchlib.rankingexpression.parser.CellMapHelper)",
+      "public final void mixedBlock(com.yahoo.searchlib.rankingexpression.parser.CellMapHelper)",
       "public final java.util.List indexedTensorCells()",
       "public final void indexedTensorCellSubspaceList(java.util.List)",
       "public final void indexedTensorCellSubspace(java.util.List)",
diff --git a/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp b/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp
index 5a4fc0c933a2..5f7df8768394 100644
--- a/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp
+++ b/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp
@@ -570,13 +570,8 @@ ShowPostingListSubApp::showPostingList()
     handle->first = offsetAndCounts._counts;
     handle->second._bitOffset = offsetAndCounts._offset;
     handle->second._bitLength = handle->first._bitLength;
-    const uint32_t first_segment = 0;
-    const uint32_t num_segments = 0;    // means all segments
     handle->second._file = postingfile.get();
-    handle->second._file->readPostingList(handle->first,
-                                       first_segment,
-                                       num_segments,
-                                       handle->second);
+    handle->second._file->readPostingList(handle->second);
     std::vector<TermFieldMatchData> tfmdv(numFields);
     TermFieldMatchDataArray tfmda;
     for (auto& tfmd : tfmdv) {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/parser/CellMapHelper.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/parser/CellMapHelper.java
new file mode 100644
index 000000000000..0a553f071120
--- /dev/null
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/parser/CellMapHelper.java
@@ -0,0 +1,143 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.searchlib.rankingexpression.parser;
+
+import com.yahoo.api.annotations.Beta;
+import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode;
+import com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode;
+import com.yahoo.searchlib.rankingexpression.Reference;
+import com.yahoo.tensor.IndexedTensor;
+import com.yahoo.tensor.Tensor;
+import com.yahoo.tensor.TensorAddress;
+import com.yahoo.tensor.TensorType;
+import com.yahoo.tensor.functions.ScalarFunction;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Helper to incrementally build addresses and insert values (expression nodes) into a map.
+ * Only used as an internal component of the RankingExpression parser.
+ * @author arnej
+ */
+public class CellMapHelper {
+
+    private record Common(Map<TensorAddress, ScalarFunction<Reference>> receivingMap,
+                          TensorType type,
+                          List<String> mappedDims,
+                          List<String> indexedDims)
+    {
+        Common(TensorType type, List<String> dimensionOrder) {
+            this(new LinkedHashMap<>(), type, new ArrayList<>(), new ArrayList<>());
+            for (String name : dimensionOrder) {
+                var dim = type.dimension(name)
+                        .orElseThrow(() -> new IllegalStateException("bad dimension name: " + name));
+                if (dim.isMapped()) {
+                    mappedDims.add(name);
+                } else {
+                    indexedDims.add(name);
+                }
+            }
+        }
+    }
+
+    private final Common meta;
+    private final List<String> labels;
+
+    public CellMapHelper(TensorType type, List<String> dimensionOrder) {
+        this.meta = new Common(type, dimensionOrder);
+        this.labels = new ArrayList<>();
+    }
+
+    private CellMapHelper(Common meta, List<String> labels) {
+        this.meta = meta;
+        this.labels = labels;
+    }
+
+    public Map<TensorAddress, ScalarFunction<Reference>> map() {
+        return meta.receivingMap();
+    }
+
+    public CellMapHelper bind(String label) {
+        if (labels.size() >= meta.mappedDims().size()) {
+            throw new IllegalArgumentException("At " + address() + ": Got label '" + label +
+                                               "' but all mapped dimensions already have labels");
+        }
+        List<String> next = new ArrayList<>(labels);
+        next.add(label);
+        return new CellMapHelper(meta, next);
+    }
+
+    private String address() {
+        var addr = new StringBuilder();
+        if (labels.size() == 1) {
+            addr.append("'");
+            addr.append(labels.get(0));
+            addr.append("'");
+        } else {
+            addr.append("{");
+            for (int idx = 0; idx < labels.size(); idx++) {
+                if (idx > 0) {
+                    addr.append(", ");
+                }
+                addr.append(meta.mappedDims().get(idx));
+                addr.append(":'");
+                addr.append(labels.get(idx));
+                addr.append("'");
+            }
+            addr.append("}");
+        }
+        return addr.toString();
+    }
+
+    public void handleScalar(ExpressionNode node) {
+        if (labels.size() < meta.mappedDims().size()) {
+            throw new IllegalArgumentException("At " + address() + ": Missing label for dimension '" +
+                                               meta.mappedDims().get(labels.size()) + "'");
+        }
+        if (meta.type().hasIndexedDimensions()) {
+            throw new IllegalArgumentException("At " + address() + ": Need an array of values");
+        }
+        var addr = new TensorAddress.Builder(meta.type());
+        for (int idx = 0; idx < labels.size(); idx++) {
+            addr.add(meta.mappedDims().get(idx), labels.get(idx));
+        }
+        meta.receivingMap().put(addr.build(), TensorFunctionNode.wrapScalar(node));
+    }
+
+    public void handleDenseSubspace(List<ExpressionNode> nodes) {
+        if (labels.size() < meta.mappedDims().size()) {
+            throw new IllegalArgumentException("At " + address() + ": Missing label for dimension '" +
+                                               meta.mappedDims().get(labels.size()) + "'");
+        }
+        if (! meta.type().hasIndexedDimensions()) {
+            throw new IllegalArgumentException("At " + address() + ": Need a single value");
+        }
+        TensorType denseSubtype = meta.type().indexedSubtype();
+        IndexedTensor.Indexes indexes = IndexedTensor.Indexes.of(denseSubtype, meta.indexedDims());
+        if (indexes.size() != nodes.size()) {
+            throw new IllegalArgumentException("At " + address() +
+                                               ": Need " + indexes.size() +
+                                               " values to fill a dense subspace of " + meta.type() +
+                                               " but got " + nodes.size());
+        }
+        var addr = new TensorAddress.Builder(meta.type());
+        for (int idx = 0; idx < labels.size(); idx++) {
+            addr.add(meta.mappedDims().get(idx), labels.get(idx));
+        }
+        for (ExpressionNode node : nodes) {
+            indexes.next();
+            int indexedDimensionsIndex = 0;
+            for (TensorType.Dimension dimension : meta.type().dimensions()) {
+                if (dimension.isIndexed()) {
+                    addr.add(dimension.name(), indexes.indexesForReading()[indexedDimensionsIndex++]);
+                }
+            }
+            meta.receivingMap().put(addr.build(), TensorFunctionNode.wrapScalar(node));
+        }
+    }
+
+}
diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj
index 51f433bf67dd..c85e9f3651f9 100644
--- a/searchlib/src/main/javacc/RankingExpressionParser.jj
+++ b/searchlib/src/main/javacc/RankingExpressionParser.jj
@@ -965,14 +965,20 @@ DynamicTensor mappedTensorValueBody(TensorType type) :
 
 DynamicTensor mixedTensorValueBody(TensorType type, List dimensionOrder) :
 {
-    java.util.Map cells = new LinkedHashMap();
+    CellMapHelper cells = new CellMapHelper(type, dimensionOrder);
+}
+{
+    mixedValueObject(cells)
+    { return DynamicTensor.from(type, cells.map()); }
 }
+
+void mixedValueObject(CellMapHelper cells) :
+{}
 {
     <LCURLY>
-        keyValueOrMixedBlock(type, dimensionOrder, cells)
-        ( <COMMA> keyValueOrMixedBlock(type, dimensionOrder, cells))*
+        keyValueOrMixedBlock(cells)
+        ( <COMMA> keyValueOrMixedBlock(cells))*
     <RCURLY>
-    { return DynamicTensor.from(type, cells); }
 }
 
 DynamicTensor indexedTensorValueBody(TensorType type, List dimensionOrder) :
@@ -984,29 +990,34 @@ DynamicTensor indexedTensorValueBody(TensorType type, List dimensionOrder) :
     { return DynamicTensor.from(type, TensorFunctionNode.wrapScalars(type, dimensionOrder, cells)); }
 }
 
-void keyValueOrMixedBlock(TensorType type, List dimensionOrder, java.util.Map cellMap) : {}
+void keyValueOrMixedBlock(CellMapHelper cellMap) :
 {
-    LOOKAHEAD(3) mixedBlock(type, dimensionOrder, cellMap) | keyValue(type, cellMap)
+    String label;
+    CellMapHelper next;
+}
+{
+    label = label() <COLON> { next = cellMap.bind(label); }
+    (
+        keyValue(next) | mixedBlock(next) | mixedValueObject(next)
+    )
 }
 
-void keyValue(TensorType type, java.util.Map cellMap) :
+void keyValue(CellMapHelper cellMap) :
 {
-    String label;
     ExpressionNode value;
 }
 {
-    label = label() <COLON> value = expression()
-    { cellMap.put(TensorAddress.ofLabels(label), TensorFunctionNode.wrapScalar(value)); }
+    value = expression()
+    { cellMap.handleScalar(value); }
 }
 
-void mixedBlock(TensorType type, List dimensionOrder, java.util.Map cellMap) :
+void mixedBlock(CellMapHelper cellMap) :
 {
-    String label;
     List cells;
 }
 {
-    label = label() <COLON> cells = indexedTensorCells()
-    { TensorFunctionNode.wrapScalarBlock(type, dimensionOrder, label, cells, cellMap); }
+    cells = indexedTensorCells()
+    { cellMap.handleDenseSubspace(cells); }
 }
 
 List indexedTensorCells() :
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
index 130518154dde..0ca8bdf8b893 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
@@ -733,6 +733,14 @@ public void testLiteralTensors() {
                                "tensor(x[3]):[1.0, 2.0, 3]");
         tester.assertEvaluates("tensor(x{},y{}):{ {x:a,y:0}:1.0, {x:b,y:0}:2.0, {x:c,y:0}:3.0 }",
                                "tensor(x{},y{}):{ {x:a,y:0}:1.0, {x:b,y:0}:2.0, {x:c,y:0}:3.0 }");
+        tester.assertEvaluates("tensor(x{},y{}):{ {x:a,y:0}:1.0, {x:b,y:0}:2.0, {x:c,y:0}:3.0 }",
+                               "tensor(x{},y{}):{ a:{0:1}, b:{0:2}, c:{0:3} }");
+        tester.assertEvaluates("tensor(x{},y{}):{ {x:a,y:0}:1.0, {x:b,y:0}:2.0, {x:c,y:0}:3.0 }",
+                               "tensor(y{},x{}):{ 0:{a:1, b:2, c:3} }");
+        tester.assertEvaluates("tensor(x{},y{}):{{x:a,y:0}:1.0,{x:a,y:1}:2.0,{x:b,y:0}:3.0,{x:b,y:1}:4.0}",
+                               "tensor(x{},y{}):{ a:{0:1, 1:2}, b:{0:3, 1:4} }");
+        tester.assertEvaluates("tensor(x{},y{},z[3]):{a:{aa:[1,0,2],bb:[3,0,4]},b:{aa:[5,0,6],bb:[7,0,8]}}",
+                               "tensor(x{},y{},z[3]):{a:{aa:[1,0,2],bb:[3,0,4]},b:{aa:[5,0,6],bb:[7,0,8]}}");
         tester.assertEvaluates("tensor(x{}):{}",
                                "tensor(x{}):{}");
         tester.assertEvaluates("tensor():{{}:1}",
@@ -790,6 +798,43 @@ public void testLiteralTensors() {
         catch (Exception e) {
             assertEquals("Need 6 values to fill tensor(x[2],y[3]) but got 7", e.getMessage());
         }
+        try {
+            new RankingExpression("tensor(a{},b{},x[2]):{a1:{b2:{c3:[1,2]}}}");
+            fail("Expected exception");
+        }
+        catch (Exception e) {
+            assertEquals("At {a:'a1', b:'b2'}: Got label 'c3' but all mapped dimensions already have labels",
+                         e.getMessage());
+        }
+        try {
+            new RankingExpression("tensor(a{},b{},x[2]):{a1:{b2:[1,2]}, a2:[3,4]}");
+            fail("Expected exception");
+        }
+        catch (Exception e) {
+            assertEquals("At 'a2': Missing label for dimension 'b'", e.getMessage());
+        }
+        try {
+            new RankingExpression("tensor(a{},b{},x[2]):{a1:{b2:42.0}}");
+            fail("Expected exception");
+        }
+        catch (Exception e) {
+            assertEquals("At {a:'a1', b:'b2'}: Need an array of values", e.getMessage());
+        }
+        try {
+            new RankingExpression("tensor(a{},b{},c{}):{a1:{b2:{c3:[0.0]}}}");
+            fail("Expected exception");
+        }
+        catch (Exception e) {
+            assertEquals("At {a:'a1', b:'b2', c:'c3'}: Need a single value", e.getMessage());
+        }
+        try {
+            new RankingExpression("tensor(a{},b{},x[3]):{a1:{b2:[1,2]}}");
+            fail("Expected exception");
+        }
+        catch (Exception e) {
+            assertEquals("At {a:'a1', b:'b2'}: Need 3 values to fill" +
+                         " a dense subspace of tensor(a{},b{},x[3]) but got 2", e.getMessage());
+        }
     }
 
     @Test
diff --git a/searchlib/src/tests/aggregator/perdocexpr_test.cpp b/searchlib/src/tests/aggregator/perdocexpr_test.cpp
index e17085d12eb2..b3e60dbdffcf 100644
--- a/searchlib/src/tests/aggregator/perdocexpr_test.cpp
+++ b/searchlib/src/tests/aggregator/perdocexpr_test.cpp
@@ -585,7 +585,7 @@ std::string
 getVespaChecksumV2(const std::string& ymumid, int fid, const std::string& flags_str)
 {
     if (fid == 6 || fid == 0 || fid == 5) {
-        return 0;
+        return {};
     }
 
     std::list<char> flags_list;
diff --git a/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp b/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp
index 489b4e01aa41..bf69b3712ec0 100644
--- a/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp
+++ b/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp
@@ -50,6 +50,8 @@ using LookupResult = DiskIndex::LookupResult;
 
 namespace {
 
+std::string test_dir("index");
+
 SimpleStringTerm
 makeTerm(const std::string & term)
 {
@@ -118,6 +120,10 @@ class DiskIndexTest : public ::testing::Test, public TestDiskIndex {
     FakeRequestContext _requestContext;
 
 protected:
+    DiskIndexTest();
+    ~DiskIndexTest() override;
+    static void SetUpTestSuite();
+    static void TearDownTestSuite();
     void requireThatLookupIsWorking(const EmptySettings& empty_settings);
     void requireThatWeCanReadPostingList();
     void require_that_we_can_get_field_length_info();
@@ -125,18 +131,32 @@ class DiskIndexTest : public ::testing::Test, public TestDiskIndex {
     void requireThatBlueprintIsCreated();
     void requireThatBlueprintCanCreateSearchIterators();
     void requireThatSearchIteratorsConforms();
+    void require_that_get_stats_works();
     void build_index(const IOSettings& io_settings, const EmptySettings& empty_settings);
     void test_empty_settings(const EmptySettings& empty_settings);
     void test_io_settings(const IOSettings& io_settings);
-public:
-    DiskIndexTest();
-    ~DiskIndexTest();
 };
 
 DiskIndexTest::DiskIndexTest() = default;
 
 DiskIndexTest::~DiskIndexTest() = default;
 
+void
+DiskIndexTest::SetUpTestSuite()
+{
+    DummyFileHeaderContext::setCreator("diskindex_test");
+    std::filesystem::path index_path(test_dir);
+    std::filesystem::remove_all(index_path);
+    std::filesystem::create_directory(index_path);
+}
+
+void
+DiskIndexTest::TearDownTestSuite()
+{
+    std::filesystem::path index_path(test_dir);
+    std::filesystem::remove_all(index_path);
+}
+
 void
 DiskIndexTest::requireThatSearchIteratorsConforms()
 {
@@ -374,7 +394,7 @@ DiskIndexTest::build_index(const IOSettings& io_settings, const EmptySettings& e
     if (io_settings._use_mmap) {
         io_settings_num += 2;
     }
-    name << "index/" << io_settings_num;
+    name << test_dir << "/" << io_settings_num;
     if (empty_settings._empty_field) {
         name << "fe";
     } else {
@@ -390,11 +410,28 @@ DiskIndexTest::build_index(const IOSettings& io_settings, const EmptySettings& e
               empty_settings._empty_doc, empty_settings._empty_word);
 }
 
+void
+DiskIndexTest::require_that_get_stats_works()
+{
+    auto stats = getIndex().get_stats();
+    auto& schema = getIndex().getSchema();
+    EXPECT_LT(0, stats.sizeOnDisk());
+    auto field_stats = stats.get_field_stats();
+    EXPECT_EQ(schema.getNumIndexFields(), field_stats.size());
+    for (auto& field : schema.getIndexFields()) {
+        auto& field_name = field.getName();
+        ASSERT_TRUE(field_stats.contains(field_name));
+        EXPECT_LT(0, field_stats[field_name].size_on_disk());
+        EXPECT_GT(stats.sizeOnDisk(), field_stats[field_name].size_on_disk());
+    }
+}
+
 void
 DiskIndexTest::test_empty_settings(const EmptySettings& empty_settings)
 {
     build_index(IOSettings(), empty_settings);
     requireThatLookupIsWorking(empty_settings);
+    require_that_get_stats_works();
 }
 
 void
@@ -408,6 +445,7 @@ DiskIndexTest::test_io_settings(const IOSettings& io_settings)
     requireThatWeCanReadBitVector();
     requireThatBlueprintIsCreated();
     requireThatBlueprintCanCreateSearchIterators();
+    require_that_get_stats_works();
 }
 
 TEST_F(DiskIndexTest, empty_settings_empty_field_empty_doc_empty_word)
@@ -472,17 +510,4 @@ TEST_F(DiskIndexTest, search_iterators_conformance)
 
 }
 
-int
-main(int argc, char* argv[])
-{
-    if (argc > 0) {
-        DummyFileHeaderContext::setCreator(argv[0]);
-    }
-    ::testing::InitGoogleTest(&argc, argv);
-    std::filesystem::path index_path("index");
-    std::filesystem::remove_all(index_path);
-    std::filesystem::create_directory(index_path);
-    auto rval = RUN_ALL_TESTS();
-    std::filesystem::remove_all(index_path);
-    return rval;
-}
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
index e6c0a633e5ad..2ba7191e86f9 100644
--- a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
+++ b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
@@ -508,10 +508,7 @@ randReadField(FakeWordSet &wordSet,
                 handle._file = postingFile;
                 handle._bitOffset = offsetAndCounts._offset;
 
-                postingFile->readPostingList(counts,
-                        0,
-                        counts._segments.empty() ? 1 : counts._segments.size(),
-                        handle);
+                postingFile->readPostingList(handle);
 
                 TermFieldMatchData mdfield1;
                 TermFieldMatchDataArray tfmda;
diff --git a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp
index 460de0b3cc71..1766cc214955 100644
--- a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp
+++ b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp
@@ -110,7 +110,7 @@ struct VespaWandFactory : WandFactory {
     ~VespaWandFactory() override;
     std::string name() const override { return make_string("VESPA WAND (n=%u)", n); }
     SearchIterator::UP create(const wand::Terms &terms) override {
-        return WeakAndSearch::create(terms, wand::MatchParams(_scores, 1, 1), n, true, false);
+        return WeakAndSearch::create(terms, wand::MatchParams(_scores, 1, -1, 1), n, true, false);
     }
 };
 
@@ -126,7 +126,7 @@ struct VespaArrayWandFactory : WandFactory {
     ~VespaArrayWandFactory() override;
     std::string name() const override { return make_string("VESPA ARRAY WAND (n=%u)", n); }
     SearchIterator::UP create(const wand::Terms &terms) override {
-        return WeakAndSearch::createArrayWand(terms, wand::MatchParams(_scores, 1, 1), wand::TermFrequencyScorer(), n, true, false);
+        return WeakAndSearch::createArrayWand(terms, wand::MatchParams(_scores, 1, -1, 1), wand::TermFrequencyScorer(), n, true, false);
     }
 };
 
@@ -142,7 +142,7 @@ struct VespaHeapWandFactory : WandFactory {
     ~VespaHeapWandFactory() override;
     std::string name() const override { return make_string("VESPA HEAP WAND (n=%u)", n); }
     SearchIterator::UP create(const wand::Terms &terms) override {
-        return WeakAndSearch::createHeapWand(terms, wand::MatchParams(_scores, 1, 1), wand::TermFrequencyScorer(), n, true, false);
+        return WeakAndSearch::createHeapWand(terms, wand::MatchParams(_scores, 1, -1, 1), wand::TermFrequencyScorer(), n, true, false);
     }
 };
 
diff --git a/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp b/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp
index 3fc31e4456d5..bbf47cb61590 100644
--- a/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp
+++ b/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp
@@ -23,19 +23,28 @@ struct MyWandSpec : public WandSpec
     SharedWeakAndPriorityQueue scores;
     uint32_t n;
     MatchingPhase matching_phase;
+    wand::MatchParams my_params;
 
     explicit MyWandSpec(uint32_t n_in)
         : WandSpec(),
           scores(n_in),
           n(n_in),
-          matching_phase(MatchingPhase::FIRST_PHASE)
+          matching_phase(MatchingPhase::FIRST_PHASE),
+          my_params(scores, 1, -1, 1)
     {}
     SearchIterator *create() {
         bool readonly_scores_heap = (matching_phase != MatchingPhase::FIRST_PHASE);
         return new TrackedSearch("WAND", getHistory(),
-                                 WeakAndSearch::create(getTerms(), wand::MatchParams(scores, 1, 1), n, true, readonly_scores_heap));
+                                 WeakAndSearch::create(getTerms(), my_params, n, true, readonly_scores_heap));
     }
     void set_second_phase() { matching_phase = MatchingPhase::SECOND_PHASE; }
+    void set_abs_stop_word_limit(uint32_t limit) { my_params.abs_stop_word_limit = limit; }
+    SimpleResult search() {
+        SearchIterator::UP search(create());
+        SimpleResult hits;
+        hits.search(*search);
+        return hits;
+    }
 };
 
 struct SimpleWandFixture {
@@ -140,6 +149,22 @@ TEST(WeakAndTest, require_that_initial_docid_for_subsearches_are_taken_into_acco
               history);
 }
 
+TEST(WeakAndTest, require_that_the_worst_normal_word_must_match_when_using_stop_word_limit) {
+    MyWandSpec spec(1000); // avoid limiting hits with heap
+    spec.leaf(LeafSpec("1").doc(1).doc(2).doc(3).doc(4));
+    spec.leaf(LeafSpec("2").doc(5).doc(6).doc(7));
+    spec.leaf(LeafSpec("3").doc(8).doc(9));
+    spec.set_abs_stop_word_limit(4);
+    EXPECT_EQ(SimpleResult().addHit(1).addHit(2).addHit(3).addHit(4).addHit(5)
+                      .addHit(6).addHit(7).addHit(8).addHit(9), spec.search());
+    spec.set_abs_stop_word_limit(3);
+    EXPECT_EQ(SimpleResult().addHit(5).addHit(6).addHit(7).addHit(8).addHit(9), spec.search());
+    spec.set_abs_stop_word_limit(2);
+    EXPECT_EQ(SimpleResult().addHit(8).addHit(9), spec.search()); // Note: must match only non-stop word
+    spec.set_abs_stop_word_limit(1);
+    EXPECT_EQ(SimpleResult().addHit(8).addHit(9), spec.search()); // Note: must match best stop word
+}
+
 class IteratorChildrenVerifier : public search::test::IteratorChildrenVerifier {
 public:
     IteratorChildrenVerifier();
@@ -154,7 +179,7 @@ class IteratorChildrenVerifier : public search::test::IteratorChildrenVerifier {
         }
         static constexpr size_t LARGE_ENOUGH_HEAP_FOR_ALL = 10000;
         _scores.push_back(std::make_unique<SharedWeakAndPriorityQueue>(LARGE_ENOUGH_HEAP_FOR_ALL));
-        return WeakAndSearch::create(terms, wand::MatchParams(*_scores.back(), 1, 1), -1, strict, false);
+        return WeakAndSearch::create(terms, wand::MatchParams(*_scores.back(), 1, -1, 1), -1, strict, false);
     }
 };
 
diff --git a/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp b/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp
index 2376f4854303..b1c5b5d648c2 100644
--- a/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp
+++ b/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp
@@ -38,4 +38,29 @@ TEST(SearchableStatsTest, stats_can_be_merged)
     EXPECT_EQ(1300u, stats.fusion_size_on_disk());
 }
 
+TEST(SearchableStatsTest, field_stats_can_be_merged)
+{
+    SearchableStats base_stats;
+    auto f1_stats = FieldIndexStats().memory_usage({100, 40, 10, 5}).size_on_disk(1000).
+        disk_io_stats(DiskIoStats().read_operations(1).read_bytes_total(1000).read_bytes_min(1000).read_bytes_max(1000));
+    auto f2_stats1 = FieldIndexStats().memory_usage({400, 200, 60, 10}).size_on_disk(1500).
+        disk_io_stats(DiskIoStats().read_operations(1).read_bytes_total(1000).read_bytes_min(1000).read_bytes_max(1000));
+    auto f2_stats2 = FieldIndexStats().memory_usage({300, 100, 40, 5}).size_on_disk(500).
+        disk_io_stats(DiskIoStats().read_operations(4).read_bytes_total(6000).read_bytes_min(1100).read_bytes_max(2700));
+    auto f2_stats3 = FieldIndexStats().memory_usage({700, 300, 100, 15}).size_on_disk(2000).
+        disk_io_stats(DiskIoStats().read_operations(5).read_bytes_total(7000).read_bytes_min(1000).read_bytes_max(2700));
+    auto f3_stats = FieldIndexStats().memory_usage({110, 50, 20, 12}).size_on_disk(500).
+        disk_io_stats(DiskIoStats().read_operations(1).read_bytes_total(1000).read_bytes_min(1000).read_bytes_max(1000));
+    base_stats.add_field_stats("f1", f1_stats).add_field_stats("f2", f2_stats1);
+    SearchableStats added_stats;
+    added_stats.add_field_stats("f2", f2_stats2).add_field_stats("f3", f3_stats);
+    SearchableStats act_stats = base_stats;
+    act_stats.merge(added_stats);
+    SearchableStats exp_stats;
+    exp_stats.add_field_stats("f1", f1_stats).
+        add_field_stats("f2", f2_stats3).
+        add_field_stats("f3", f3_stats);
+    EXPECT_EQ(exp_stats, act_stats);
+}
+
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchlib/src/vespa/searchcommon/common/schema.h b/searchlib/src/vespa/searchcommon/common/schema.h
index 4649decaa5fa..2c3e9bff711e 100644
--- a/searchlib/src/vespa/searchcommon/common/schema.h
+++ b/searchlib/src/vespa/searchcommon/common/schema.h
@@ -17,7 +17,6 @@ class Schema
 {
 public:
     using UP = std::unique_ptr<Schema>;
-    using SP = std::shared_ptr<Schema>;
 
     using DataType = schema::DataType;
     using CollectionType = schema::CollectionType;
diff --git a/searchlib/src/vespa/searchlib/aggregation/grouping.cpp b/searchlib/src/vespa/searchlib/aggregation/grouping.cpp
index 5d8eafce277e..fc420da14fb6 100644
--- a/searchlib/src/vespa/searchlib/aggregation/grouping.cpp
+++ b/searchlib/src/vespa/searchlib/aggregation/grouping.cpp
@@ -92,8 +92,11 @@ class GlobalIdConverter : public vespalib::ObjectOperation, public vespalib::Obj
     void execute(vespalib::Identifiable & obj) override {
         FS4Hit & hit = static_cast<FS4Hit &>(obj);
         document::GlobalId gid;
-        _metaStore.getGid(hit.getDocId(), gid);
-        hit.setGlobalId(gid);
+        if (_metaStore.getGidEvenIfMoved(hit.getDocId(), gid)) {
+            hit.setGlobalId(gid);
+        } else {
+            LOG(warning, "Missing globalid for grouping hit %u", hit.getDocId());
+        }
         LOG(debug, "GlobalIdConverter: lid(%u) -> gid(%s)", hit.getDocId(), hit.getGlobalId().toString().c_str());
     }
     bool check(const vespalib::Identifiable & obj) const override {
diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_params.h b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_params.h
index ac6fc6f603a2..0f77baafe29e 100644
--- a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_params.h
+++ b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_params.h
@@ -17,17 +17,20 @@ struct AttributeBlueprintParams
     double target_hits_max_adjustment_factor;
     vespalib::FuzzyMatchingAlgorithm fuzzy_matching_algorithm;
     double weakand_range;
+    uint32_t abs_weakand_stop_word_limit;
 
     AttributeBlueprintParams(double global_filter_lower_limit_in,
                              double global_filter_upper_limit_in,
                              double target_hits_max_adjustment_factor_in,
                              vespalib::FuzzyMatchingAlgorithm fuzzy_matching_algorithm_in,
-                             double weakand_range_in)
+                             double weakand_range_in,
+                             uint32_t abs_wand_stop_word_limit_in)
         : global_filter_lower_limit(global_filter_lower_limit_in),
           global_filter_upper_limit(global_filter_upper_limit_in),
           target_hits_max_adjustment_factor(target_hits_max_adjustment_factor_in),
           fuzzy_matching_algorithm(fuzzy_matching_algorithm_in),
-          weakand_range(weakand_range_in)
+          weakand_range(weakand_range_in),
+          abs_weakand_stop_word_limit(abs_wand_stop_word_limit_in)
     {
     }
 
@@ -36,7 +39,8 @@ struct AttributeBlueprintParams
                                    fef::indexproperties::matching::GlobalFilterUpperLimit::DEFAULT_VALUE,
                                    fef::indexproperties::matching::TargetHitsMaxAdjustmentFactor::DEFAULT_VALUE,
                                    fef::indexproperties::matching::FuzzyAlgorithm::DEFAULT_VALUE,
-                                   fef::indexproperties::temporary::WeakAndRange::DEFAULT_VALUE)
+                                   fef::indexproperties::temporary::WeakAndRange::DEFAULT_VALUE,
+                                   fef::indexproperties::matching::WeakAndStopWordLimit::DEFAULT_VALUE)
     {
     }
 };
diff --git a/searchlib/src/vespa/searchlib/attribute/diversity.cpp b/searchlib/src/vespa/searchlib/attribute/diversity.cpp
index 3dfc405bfded..b3d9fd4b245e 100644
--- a/searchlib/src/vespa/searchlib/attribute/diversity.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/diversity.cpp
@@ -101,7 +101,7 @@ DiversityFilterT<Fetcher>::accepted(uint32_t docId) {
 
 std::unique_ptr<DiversityFilter>
 DiversityFilter::create(const IAttributeVector &diversity_attr, size_t wanted_hits,
-                        size_t max_per_group,size_t cutoff_max_groups, bool cutoff_strict)
+                        size_t max_per_group, size_t cutoff_max_groups, bool cutoff_strict)
 {
     if (diversity_attr.hasEnum()) { // must handle enum first
         FetchEnumFast fastEnum(diversity_attr);
diff --git a/searchlib/src/vespa/searchlib/attribute/diversity.h b/searchlib/src/vespa/searchlib/attribute/diversity.h
index 4a182cb58a12..134c34798571 100644
--- a/searchlib/src/vespa/searchlib/attribute/diversity.h
+++ b/searchlib/src/vespa/searchlib/attribute/diversity.h
@@ -65,7 +65,7 @@ class DiversityFilter : public queryeval::IDiversifier {
     size_t getMaxTotal() const { return _max_total; }
     static std::unique_ptr<DiversityFilter>
     create(const IAttributeVector &diversity_attr, size_t wanted_hits,
-           size_t max_per_group,size_t cutoff_max_groups, bool cutoff_strict);
+           size_t max_per_group, size_t cutoff_max_groups, bool cutoff_strict);
 protected:
     size_t _max_total;
 };
diff --git a/searchlib/src/vespa/searchlib/bitcompression/compression.cpp b/searchlib/src/vespa/searchlib/bitcompression/compression.cpp
index 41c4ce8d948f..9b8be594c594 100644
--- a/searchlib/src/vespa/searchlib/bitcompression/compression.cpp
+++ b/searchlib/src/vespa/searchlib/bitcompression/compression.cpp
@@ -96,7 +96,7 @@ EncodeContext64EBase<false>::writeBits(uint64_t data, uint32_t length)
 {
     // While there are enough bits remaining in "data",
     // fill the cacheInt and flush it to vector
-    if (length >= _cacheFree) {
+    if (length >= _cacheFree) [[unlikely]] {
         // Shift new bits into cacheInt
         _cacheInt |= (data << (64 - _cacheFree));
         *_valI++ = bswap(_cacheInt);
@@ -107,7 +107,7 @@ EncodeContext64EBase<false>::writeBits(uint64_t data, uint32_t length)
         _cacheFree = 64;
     }
 
-    if (length > 0) {
+    if (length > 0) [[likely]] {
         uint64_t dataFragment = (data & CodingTables::_intMask64[length]);
         _cacheInt |= (dataFragment << (64 - _cacheFree));
         _cacheFree -= length;
@@ -268,6 +268,16 @@ FeatureEncodeContext<bigEndian>::writeBytes(std::span<const char> buf)
     }
 }
 
+template <bool bigEndian>
+void
+FeatureEncodeContext<bigEndian>::writeBytes(std::span<const unsigned char> buf)
+{
+    for (unsigned char c : buf) {
+        writeBits(c, 8);
+        writeComprBufferIfNeeded();
+    }
+}
+
 template <bool bigEndian>
 void
 FeatureEncodeContext<bigEndian>::
@@ -447,7 +457,7 @@ EncodeContext64EBase<true>::writeBits(uint64_t data, uint32_t length)
 {
     // While there are enough bits remaining in "data",
     // fill the cacheInt and flush it to vector
-    if (length >= _cacheFree) {
+    if (length >= _cacheFree) [[unlikely]] {
         // Shift new bits into cacheInt
         _cacheInt |= ((data >> (length - _cacheFree)) &
                       CodingTables::_intMask64[_cacheFree]);
@@ -459,7 +469,7 @@ EncodeContext64EBase<true>::writeBits(uint64_t data, uint32_t length)
         _cacheFree = 64;
     }
 
-    if (length > 0) {
+    if (length > 0) [[likely]] {
         uint64_t dataFragment = (data & CodingTables::_intMask64[length]);
         _cacheInt |= (dataFragment << (_cacheFree - length));
         _cacheFree -= length;
diff --git a/searchlib/src/vespa/searchlib/bitcompression/compression.h b/searchlib/src/vespa/searchlib/bitcompression/compression.h
index 64bc54ea6ca6..d5473995cb96 100644
--- a/searchlib/src/vespa/searchlib/bitcompression/compression.h
+++ b/searchlib/src/vespa/searchlib/bitcompression/compression.h
@@ -1493,11 +1493,12 @@ class FeatureEncodeContext : public EncodeContext64<bigEndian>
 
     void writeBits(const uint64_t *bits, uint32_t bitOffset, uint32_t bitLength);
     void writeBytes(std::span<const char> buf);
+    void writeBytes(std::span<const unsigned char> buf);
     void writeString(std::string_view buf);
     virtual void writeHeader(const vespalib::GenericHeader &header);
 
     void writeComprBufferIfNeeded() {
-        if (_valI >= _valE) {
+        if (_valI >= _valE) [[unlikely]] {
             _writeContext->writeComprBuffer(false);
         }
     }
diff --git a/searchlib/src/vespa/searchlib/diskindex/CMakeLists.txt b/searchlib/src/vespa/searchlib/diskindex/CMakeLists.txt
index 6a69515463f5..a28ae1738818 100644
--- a/searchlib/src/vespa/searchlib/diskindex/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/diskindex/CMakeLists.txt
@@ -10,6 +10,7 @@ vespa_add_library(searchlib_diskindex OBJECT
     disktermblueprint.cpp
     docidmapper.cpp
     extposocc.cpp
+    field_index.cpp
     field_merger.cpp
     field_mergers_state.cpp
     field_merger_task.cpp
diff --git a/searchlib/src/vespa/searchlib/diskindex/diskindex.cpp b/searchlib/src/vespa/searchlib/diskindex/diskindex.cpp
index 5258921a8c8c..709f7080f515 100644
--- a/searchlib/src/vespa/searchlib/diskindex/diskindex.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/diskindex.cpp
@@ -30,10 +30,8 @@ void swap(DiskIndex::LookupResult & a, DiskIndex::LookupResult & b)
 }
 
 DiskIndex::LookupResult::LookupResult() noexcept
-    : indexId(0u),
-      wordNum(0),
-      counts(),
-      bitOffset(0)
+    : DictionaryLookupResult(),
+      indexId(0u)
 {
 }
 
@@ -52,10 +50,7 @@ DiskIndex::DiskIndex(const std::string &indexDir, size_t cacheSize)
     : _indexDir(indexDir),
       _cacheSize(cacheSize),
       _schema(),
-      _postingFiles(),
-      _bitVectorDicts(),
-      _dicts(),
-      _field_index_sizes_on_disk(),
+      _field_indexes(),
       _nonfield_size_on_disk(0),
       _tuneFileSearch(),
       _cache(*this, cacheSize)
@@ -84,68 +79,16 @@ bool
 DiskIndex::openDictionaries(const TuneFileSearch &tuneFileSearch)
 {
     for (SchemaUtil::IndexIterator itr(_schema); itr.isValid(); ++itr) {
-        std::string dictName = _indexDir + "/" + itr.getName() + "/dictionary";
-        auto dict = std::make_unique<PageDict4RandRead>();
-        if (!dict->open(dictName, tuneFileSearch._read)) {
-            LOG(warning, "Could not open disk dictionary '%s'", dictName.c_str());
-            _dicts.clear();
+        std::string field_dir = _indexDir + "/" + itr.getName();
+        _field_indexes.emplace_back();
+        if (!_field_indexes.back().open_dictionary(field_dir, tuneFileSearch)) {
+            _field_indexes.clear();
             return false;
         }
-        _dicts.push_back(std::move(dict));
     }
     return true;
 }
 
-bool
-DiskIndex::openField(const std::string &fieldDir,
-                     const TuneFileSearch &tuneFileSearch)
-{
-    std::string postingName = fieldDir + "posocc.dat.compressed";
-
-    DiskPostingFile::SP pFile;
-    BitVectorDictionary::SP bDict;
-    FileHeader fileHeader;
-    bool dynamicK = false;
-    if (fileHeader.taste(postingName, tuneFileSearch._read)) {
-        if (fileHeader.getVersion() == 1 &&
-            fileHeader.getBigEndian() &&
-            fileHeader.getFormats().size() == 2 &&
-            fileHeader.getFormats()[0] ==
-            DiskPostingFileDynamicKReal::getIdentifier() &&
-            fileHeader.getFormats()[1] ==
-            DiskPostingFileDynamicKReal::getSubIdentifier()) {
-            dynamicK = true;
-        } else if (fileHeader.getVersion() == 1 &&
-                   fileHeader.getBigEndian() &&
-                   fileHeader.getFormats().size() == 2 &&
-                   fileHeader.getFormats()[0] ==
-                   DiskPostingFileReal::getIdentifier() &&
-                   fileHeader.getFormats()[1] ==
-                   DiskPostingFileReal::getSubIdentifier()) {
-            dynamicK = false;
-        } else {
-            LOG(warning, "Could not detect format for posocc file read %s", postingName.c_str());
-        }
-    }
-    pFile.reset(dynamicK
-                ? new DiskPostingFileDynamicKReal()
-                : new DiskPostingFileReal());
-    if (!pFile->open(postingName, tuneFileSearch._read)) {
-        LOG(warning, "Could not open posting list file '%s'", postingName.c_str());
-        return false;
-    }
-
-    bDict.reset(new BitVectorDictionary());
-    if (!bDict->open(fieldDir, tuneFileSearch._read, BitVectorKeyScope::PERFIELD_WORDS)) {
-        LOG(warning, "Could not open bit vector dictionary in '%s'", fieldDir.c_str());
-        return false;
-    }
-    _postingFiles.push_back(pFile);
-    _bitVectorDicts.push_back(bDict);
-    _field_index_sizes_on_disk.push_back(calculate_field_index_size_on_disk(fieldDir));
-    return true;
-}
-
 bool
 DiskIndex::setup(const TuneFileSearch &tuneFileSearch)
 {
@@ -157,7 +100,8 @@ DiskIndex::setup(const TuneFileSearch &tuneFileSearch)
     }
     for (SchemaUtil::IndexIterator itr(_schema); itr.isValid(); ++itr) {
         std::string fieldDir = _indexDir + "/" + itr.getName() + "/";
-        if (!openField(fieldDir, tuneFileSearch)) {
+        auto& field_index = _field_indexes[itr.getIndex()];
+        if (!field_index.open(fieldDir, tuneFileSearch)) {
             return false;
         }
     }
@@ -181,16 +125,15 @@ DiskIndex::setup(const TuneFileSearch &tuneFileSearch, const DiskIndex &old)
         if (settings.hasError()) {
             return false;
         }
+        auto& field_index = _field_indexes[itr.getIndex()];
         SchemaUtil::IndexIterator oItr(oldSchema, itr);
         if (!itr.hasMatchingOldFields(oldSchema) || !oItr.isValid()) {
-            if (!openField(fieldDir, tuneFileSearch)) {
+            if (!field_index.open(fieldDir, tuneFileSearch)) {
                 return false;
             }
         } else {
-            uint32_t oldPacked = oItr.getIndex();
-            _postingFiles.push_back(old._postingFiles[oldPacked]);
-            _bitVectorDicts.push_back(old._bitVectorDicts[oldPacked]);
-            _field_index_sizes_on_disk.push_back(old._field_index_sizes_on_disk[oldPacked]);
+            auto& old_field_index = old._field_indexes[oItr.getIndex()];
+            field_index.reuse_files(old_field_index);
         }
     }
     _tuneFileSearch = tuneFileSearch;
@@ -281,8 +224,8 @@ DiskIndex::read(const Key & key, LookupResultVector & result)
         wordNum = 0;
         SchemaUtil::IndexIterator it(_schema, lr.indexId);
         uint32_t fieldId = it.getIndex();
-        if (fieldId < _dicts.size()) {
-            (void) _dicts[fieldId]->lookup(key.getWord(), wordNum,offsetAndCounts);
+        if (fieldId < _field_indexes.size()) {
+            (void) _field_indexes[fieldId].get_dictionary()->lookup(key.getWord(), wordNum,offsetAndCounts);
         }
         lr.wordNum = wordNum;
         lr.counts.swap(offsetAndCounts._counts);
@@ -294,42 +237,19 @@ DiskIndex::read(const Key & key, LookupResultVector & result)
 index::PostingListHandle::UP
 DiskIndex::readPostingList(const LookupResult &lookupRes) const
 {
-    PostingListHandle::UP handle(new PostingListHandle());
-    handle->_bitOffset = lookupRes.bitOffset;
-    handle->_bitLength = lookupRes.counts._bitLength;
-    SchemaUtil::IndexIterator it(_schema, lookupRes.indexId);
-    handle->_file = _postingFiles[it.getIndex()].get();
-    if (handle->_file == nullptr) {
-        return {};
-    }
-    const uint32_t firstSegment = 0;
-    const uint32_t numSegments = 0; // means all segments
-    handle->_file->readPostingList(lookupRes.counts, firstSegment, numSegments,*handle);
-    return handle;
+    auto& field_index = _field_indexes[lookupRes.indexId];
+    return field_index.read_posting_list(lookupRes);
 }
 
 BitVector::UP
 DiskIndex::readBitVector(const LookupResult &lookupRes) const
 {
-    SchemaUtil::IndexIterator it(_schema, lookupRes.indexId);
-    BitVectorDictionary * dict = _bitVectorDicts[it.getIndex()].get();
-    if (dict == nullptr) {
-        return {};
-    }
-    return dict->lookup(lookupRes.wordNum);
+    auto& field_index = _field_indexes[lookupRes.indexId];
+    return field_index.read_bit_vector(lookupRes);
 }
 
 namespace {
 
-const std::vector<std::string> field_file_names{
-    "boolocc.bdat",
-    "boolocc.idx",
-    "posocc.dat.compressed",
-    "dictionary.pdat",
-    "dictionary.spdat",
-    "dictionary.ssdat"
-};
-
 const std::vector<std::string> nonfield_file_names{
     "docsum.qcnt",
     "schema.txt",
@@ -340,33 +260,10 @@ const std::vector<std::string> nonfield_file_names{
 
 }
 
-uint64_t
-DiskIndex::calculate_size_on_disk(const std::string& dir, const std::vector<std::string>& file_names)
-{
-    uint64_t size_on_disk = 0;
-    std::error_code ec;
-    DiskSpaceCalculator calc;
-    for (auto& file_name : file_names) {
-        // Note: dir ends with slash
-        std::filesystem::path path(dir + file_name);
-        auto size = std::filesystem::file_size(path, ec);
-        if (!ec) {
-            size_on_disk += calc(size);
-        }
-    }
-    return size_on_disk;
-}
-
-uint64_t
-DiskIndex::calculate_field_index_size_on_disk(const std::string& field_dir)
-{
-    return calculate_size_on_disk(field_dir, field_file_names);
-}
-
 void
 DiskIndex::calculate_nonfield_size_on_disk()
 {
-    _nonfield_size_on_disk = calculate_size_on_disk(_indexDir + "/", nonfield_file_names);
+    _nonfield_size_on_disk = FieldIndex::calculate_size_on_disk(_indexDir + "/", nonfield_file_names);
 }
 
 namespace {
@@ -509,7 +406,7 @@ DiskIndex::get_field_length_info(const std::string& field_name) const
 {
     uint32_t fieldId = _schema.getIndexFieldId(field_name);
     if (fieldId != Schema::UNKNOWN_FIELD_ID) {
-        return _postingFiles[fieldId]->get_field_length_info();
+        return _field_indexes[fieldId].get_field_length_info();
     } else {
         return {};
     }
@@ -520,8 +417,12 @@ DiskIndex::get_stats() const
 {
     SearchableStats stats;
     uint64_t size_on_disk = _nonfield_size_on_disk;
-    for (const auto& field_index_size_on_disk : _field_index_sizes_on_disk) {
-        size_on_disk += field_index_size_on_disk;
+    uint32_t field_id = 0;
+    for (auto& field_index : _field_indexes) {
+        auto field_stats = field_index.get_stats();
+        size_on_disk += field_stats.size_on_disk();
+        stats.add_field_stats(_schema.getIndexField(field_id).getName(), field_stats);
+        ++field_id;
     }
     stats.sizeOnDisk(size_on_disk);
     return stats;
diff --git a/searchlib/src/vespa/searchlib/diskindex/diskindex.h b/searchlib/src/vespa/searchlib/diskindex/diskindex.h
index a4f81321475e..97e01be46c1a 100644
--- a/searchlib/src/vespa/searchlib/diskindex/diskindex.h
+++ b/searchlib/src/vespa/searchlib/diskindex/diskindex.h
@@ -2,10 +2,7 @@
 
 #pragma once
 
-#include "bitvectordictionary.h"
-#include "zcposoccrandread.h"
-#include <vespa/searchlib/index/dictionaryfile.h>
-#include <vespa/searchlib/index/field_length_info.h>
+#include "field_index.h"
 #include <vespa/searchlib/queryeval/searchable.h>
 #include <vespa/searchlib/util/searchable_stats.h>
 #include <vespa/searchcommon/common/schema.h>
@@ -16,29 +13,19 @@ namespace search::diskindex {
 
 /**
  * This class represents a disk index that contains a set of field indexes that are independent of each other.
- *
- * Each field index has a dictionary, posting list files and bit vector files.
- * Parts of the disk dictionary and all bit vector dictionaries are loaded into memory during setup.
- * All other files are just opened, ready for later access.
  */
 class DiskIndex : public queryeval::Searchable {
 public:
     /**
      * The result after performing a disk dictionary lookup.
      **/
-    struct LookupResult {
+    struct LookupResult : public search::index::DictionaryLookupResult {
         uint32_t                         indexId;
-        uint64_t                         wordNum;
-        index::PostingListCounts         counts;
-        uint64_t                         bitOffset;
         using UP = std::unique_ptr<LookupResult>;
         LookupResult() noexcept;
-        bool valid() const noexcept { return counts._numDocs > 0; }
         void swap(LookupResult & rhs) noexcept {
+            DictionaryLookupResult::swap(rhs);
             std::swap(indexId , rhs.indexId);
-            std::swap(wordNum , rhs.wordNum);
-            counts.swap(rhs.counts);
-            std::swap(bitOffset , rhs.bitOffset);
         }
     };
     using LookupResultVector = std::vector<LookupResult>;
@@ -68,28 +55,19 @@ class DiskIndex : public queryeval::Searchable {
     };
 
 private:
-    using DiskPostingFile = index::PostingListFileRandRead;
-    using DiskPostingFileReal = Zc4PosOccRandRead;
-    using DiskPostingFileDynamicKReal = ZcPosOccRandRead;
     using Cache = vespalib::cache<vespalib::CacheParam<vespalib::LruParam<Key, LookupResultVector>, DiskIndex>>;
 
     std::string                       _indexDir;
     size_t                                 _cacheSize;
     index::Schema                          _schema;
-    std::vector<DiskPostingFile::SP>       _postingFiles;
-    std::vector<BitVectorDictionary::SP>   _bitVectorDicts;
-    std::vector<std::unique_ptr<index::DictionaryFileRandRead>> _dicts;
-    std::vector<uint64_t>                  _field_index_sizes_on_disk;
+    std::vector<FieldIndex>                _field_indexes;
     uint32_t                               _nonfield_size_on_disk;
     TuneFileSearch                         _tuneFileSearch;
     Cache                                  _cache;
 
-    static uint64_t calculate_size_on_disk(const std::string& dir, const std::vector<std::string>& file_names);
-    static uint64_t calculate_field_index_size_on_disk(const std::string& field_dir);
     void calculate_nonfield_size_on_disk();
     bool loadSchema();
     bool openDictionaries(const TuneFileSearch &tuneFileSearch);
-    bool openField(const std::string &fieldDir, const TuneFileSearch &tuneFileSearch);
 
 public:
     /**
@@ -146,7 +124,7 @@ class DiskIndex : public queryeval::Searchable {
                                                           const query::Node &term) override;
 
     /**
-     * Get the size on disk of this index.
+     * Get stats for this index.
      */
     SearchableStats get_stats() const;
     const index::Schema &getSchema() const { return _schema; }
diff --git a/searchlib/src/vespa/searchlib/diskindex/disktermblueprint.cpp b/searchlib/src/vespa/searchlib/diskindex/disktermblueprint.cpp
index 582349877726..d6de01e1d444 100644
--- a/searchlib/src/vespa/searchlib/diskindex/disktermblueprint.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/disktermblueprint.cpp
@@ -83,7 +83,7 @@ DiskTermBlueprint::createLeafSearch(const TermFieldMatchDataArray & tfmda) const
             getName(_lookupRes->indexId).c_str(), _lookupRes->wordNum, _lookupRes->counts._numDocs);
         return BitVectorIterator::create(_bitVector.get(), *tfmda[0], strict());
     }
-    SearchIterator::UP search(_postingHandle->createIterator(_lookupRes->counts, tfmda, _useBitVector));
+    SearchIterator::UP search(_postingHandle->createIterator(_lookupRes->counts, tfmda));
     if (_useBitVector) {
         LOG(debug, "Return BooleanMatchIteratorWrapper: %s, wordNum(%" PRIu64 "), docCount(%" PRIu64 ")",
             getName(_lookupRes->indexId).c_str(), _lookupRes->wordNum, _lookupRes->counts._numDocs);
@@ -102,7 +102,7 @@ DiskTermBlueprint::createFilterSearch(FilterConstraint) const
     if (_bitVector) {
         wrapper->wrap(BitVectorIterator::create(_bitVector.get(), *tfmda[0], strict()));
     } else {
-        wrapper->wrap(_postingHandle->createIterator(_lookupRes->counts, tfmda, _useBitVector));
+        wrapper->wrap(_postingHandle->createIterator(_lookupRes->counts, tfmda));
     }
     return wrapper;
 }
diff --git a/searchlib/src/vespa/searchlib/diskindex/field_index.cpp b/searchlib/src/vespa/searchlib/diskindex/field_index.cpp
new file mode 100644
index 000000000000..a77a9f7889cd
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/diskindex/field_index.cpp
@@ -0,0 +1,185 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "field_index.h"
+#include "fileheader.h"
+#include "pagedict4randread.h"
+#include <vespa/searchlib/util/disk_space_calculator.h>
+#include <filesystem>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".diskindex.field_index");
+
+using search::index::DictionaryLookupResult;
+using search::index::PostingListHandle;
+
+namespace search::diskindex {
+
+namespace {
+
+const std::vector<std::string> field_file_names{
+    "boolocc.bdat",
+    "boolocc.idx",
+    "posocc.dat.compressed",
+    "dictionary.pdat",
+    "dictionary.spdat",
+    "dictionary.ssdat"
+};
+
+}
+
+FieldIndex::LockedDiskIoStats::LockedDiskIoStats() noexcept
+    : DiskIoStats(),
+      _mutex()
+{
+}
+
+FieldIndex::LockedDiskIoStats::~LockedDiskIoStats() = default;
+
+FieldIndex::FieldIndex()
+    : _posting_file(),
+      _bit_vector_dict(),
+      _dict(),
+      _size_on_disk(0),
+      _disk_io_stats(std::make_shared<LockedDiskIoStats>())
+{
+}
+
+FieldIndex::FieldIndex(FieldIndex&&) = default;
+
+FieldIndex::~FieldIndex() = default;
+
+uint64_t
+FieldIndex::calculate_size_on_disk(const std::string& dir, const std::vector<std::string>& file_names)
+{
+    uint64_t size_on_disk = 0;
+    std::error_code ec;
+    DiskSpaceCalculator calc;
+    for (auto& file_name : file_names) {
+        // Note: dir ends with slash
+        std::filesystem::path path(dir + file_name);
+        auto size = std::filesystem::file_size(path, ec);
+        if (!ec) {
+            size_on_disk += calc(size);
+        }
+    }
+    return size_on_disk;
+}
+
+uint64_t
+FieldIndex::calculate_field_index_size_on_disk(const std::string& field_dir)
+{
+    return calculate_size_on_disk(field_dir, field_file_names);
+}
+
+
+
+bool
+FieldIndex::open_dictionary(const std::string& field_dir, const TuneFileSearch& tune_file_search)
+{
+    std::string dictName = field_dir + "/dictionary";
+    auto dict = std::make_unique<PageDict4RandRead>();
+    if (!dict->open(dictName, tune_file_search._read)) {
+        LOG(warning, "Could not open disk dictionary '%s'", dictName.c_str());
+        return false;
+    }
+    _dict = std::move(dict);
+    return true;
+}
+
+bool
+FieldIndex::open(const std::string& field_dir, const TuneFileSearch& tune_file_search)
+{
+    std::string postingName = field_dir + "posocc.dat.compressed";
+
+    DiskPostingFile::SP pFile;
+    BitVectorDictionary::SP bDict;
+    FileHeader fileHeader;
+    bool dynamicK = false;
+    if (fileHeader.taste(postingName, tune_file_search._read)) {
+        if (fileHeader.getVersion() == 1 &&
+            fileHeader.getBigEndian() &&
+            fileHeader.getFormats().size() == 2 &&
+            fileHeader.getFormats()[0] ==
+            DiskPostingFileDynamicKReal::getIdentifier() &&
+            fileHeader.getFormats()[1] ==
+            DiskPostingFileDynamicKReal::getSubIdentifier()) {
+            dynamicK = true;
+        } else if (fileHeader.getVersion() == 1 &&
+                   fileHeader.getBigEndian() &&
+                   fileHeader.getFormats().size() == 2 &&
+                   fileHeader.getFormats()[0] ==
+                   DiskPostingFileReal::getIdentifier() &&
+                   fileHeader.getFormats()[1] ==
+                   DiskPostingFileReal::getSubIdentifier()) {
+            dynamicK = false;
+        } else {
+            LOG(warning, "Could not detect format for posocc file read %s", postingName.c_str());
+        }
+    }
+    pFile.reset(dynamicK
+                ? new DiskPostingFileDynamicKReal()
+                : new DiskPostingFileReal());
+    if (!pFile->open(postingName, tune_file_search._read)) {
+        LOG(warning, "Could not open posting list file '%s'", postingName.c_str());
+        return false;
+    }
+
+    bDict.reset(new BitVectorDictionary());
+    if (!bDict->open(field_dir, tune_file_search._read, BitVectorKeyScope::PERFIELD_WORDS)) {
+        LOG(warning, "Could not open bit vector dictionary in '%s'", field_dir.c_str());
+        return false;
+    }
+    _posting_file = std::move(pFile);
+    _bit_vector_dict = std::move(bDict);
+    _size_on_disk = calculate_field_index_size_on_disk(field_dir);
+    return true;
+}
+
+void
+FieldIndex::reuse_files(const FieldIndex& rhs)
+{
+    _posting_file = rhs._posting_file;
+    _bit_vector_dict = rhs._bit_vector_dict;
+    _size_on_disk = rhs._size_on_disk;
+}
+
+std::unique_ptr<PostingListHandle>
+FieldIndex::read_posting_list(const DictionaryLookupResult& lookup_result) const
+{
+    auto handle = std::make_unique<PostingListHandle>();
+    handle->_bitOffset = lookup_result.bitOffset;
+    handle->_bitLength = lookup_result.counts._bitLength;
+    handle->_file = _posting_file.get();
+    if (handle->_file == nullptr) {
+        return {};
+    }
+    handle->_file->readPostingList(*handle);
+    if (handle->_read_bytes != 0) {
+        _disk_io_stats->add_read_operation(handle->_read_bytes);
+    }
+    return handle;
+}
+
+std::unique_ptr<BitVector>
+FieldIndex::read_bit_vector(const DictionaryLookupResult& lookup_result) const
+{
+    if (!_bit_vector_dict) {
+        return {};
+    }
+    return _bit_vector_dict->lookup(lookup_result.wordNum);
+}
+
+index::FieldLengthInfo
+FieldIndex::get_field_length_info() const
+{
+    return _posting_file->get_field_length_info();
+}
+
+FieldIndexStats
+FieldIndex::get_stats() const
+{
+    auto disk_io_stats = _disk_io_stats->read_and_clear();
+    return FieldIndexStats().size_on_disk(_size_on_disk).disk_io_stats(disk_io_stats);
+}
+
+}
diff --git a/searchlib/src/vespa/searchlib/diskindex/field_index.h b/searchlib/src/vespa/searchlib/diskindex/field_index.h
new file mode 100644
index 000000000000..a2c83a631210
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/diskindex/field_index.h
@@ -0,0 +1,67 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+#include "bitvectordictionary.h"
+#include "zcposoccrandread.h"
+#include <vespa/searchlib/index/dictionary_lookup_result.h>
+#include <vespa/searchlib/index/dictionaryfile.h>
+#include <vespa/searchlib/index/field_length_info.h>
+#include <vespa/searchlib/util/field_index_stats.h>
+#include <string>
+
+namespace search::diskindex {
+
+/**
+ * This class represents a field index that has a dictionary, posting list files and bit vector files.
+ * Parts of the disk dictionary and all bit vector dictionaries are loaded into memory during setup.
+ * All other files are just opened, ready for later access.
+ */
+class FieldIndex {
+    using DiskPostingFile = index::PostingListFileRandRead;
+    using DiskPostingFileReal = Zc4PosOccRandRead;
+    using DiskPostingFileDynamicKReal = ZcPosOccRandRead;
+
+    class LockedDiskIoStats : public DiskIoStats {
+        std::mutex _mutex;
+
+    public:
+        LockedDiskIoStats() noexcept;
+        ~LockedDiskIoStats();
+
+        void add_read_operation(uint64_t bytes) {
+            std::lock_guard guard(_mutex);
+            DiskIoStats::add_read_operation(bytes);
+        }
+
+        DiskIoStats read_and_clear() {
+            std::lock_guard guard(_mutex);
+            return DiskIoStats::read_and_clear();
+        }
+    };
+
+    std::shared_ptr<DiskPostingFile> _posting_file;
+    std::shared_ptr<BitVectorDictionary> _bit_vector_dict;
+    std::unique_ptr<index::DictionaryFileRandRead> _dict;
+    uint64_t _size_on_disk;
+    std::shared_ptr<LockedDiskIoStats> _disk_io_stats;
+
+public:
+    FieldIndex();
+    FieldIndex(const FieldIndex& rhs) = delete;
+    FieldIndex(FieldIndex&& rhs);
+    ~FieldIndex();
+    static uint64_t calculate_size_on_disk(const std::string& dir, const std::vector<std::string>& file_names);
+    static uint64_t calculate_field_index_size_on_disk(const std::string& field_dir);
+    bool open_dictionary(const std::string& field_dir, const TuneFileSearch& tune_file_search);
+    bool open(const std::string& field_dir, const TuneFileSearch &tune_file_search);
+    void reuse_files(const FieldIndex& rhs);
+    std::unique_ptr<index::PostingListHandle> read_posting_list(const search::index::DictionaryLookupResult& lookup_result) const;
+    std::unique_ptr<BitVector> read_bit_vector(const search::index::DictionaryLookupResult& lookup_result) const;
+    index::FieldLengthInfo get_field_length_info() const;
+
+    index::DictionaryFileRandRead* get_dictionary() noexcept { return _dict.get(); }
+    FieldIndexStats get_stats() const;
+};
+
+}
diff --git a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.cpp b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.cpp
index 3feb4a4e8a38..ab495d626ff5 100644
--- a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.cpp
@@ -28,12 +28,7 @@ template <bool bigEndian>
 void
 Zc4PostingWriter<bigEndian>::write_zc_view(std::span<const uint8_t> view)
 {
-    if (!view.empty()) {
-        _encode_context.writeBits(reinterpret_cast<const uint64_t *>(view.data()),
-                                  0,
-                                  view.size() * 8);
-    }
-
+    _encode_context.writeBytes(view);
 }
 
 template <bool bigEndian>
diff --git a/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.cpp b/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.cpp
index 567e5758bfab..ad3f80373c63 100644
--- a/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.cpp
@@ -59,11 +59,8 @@ std::unique_ptr<search::queryeval::SearchIterator>
 ZcPosOccRandRead::
 createIterator(const PostingListCounts &counts,
                const PostingListHandle &handle,
-               const search::fef::TermFieldMatchDataArray &matchData,
-               bool usebitVector) const
+               const search::fef::TermFieldMatchDataArray &matchData) const
 {
-    (void) usebitVector;
-
     assert((handle._bitLength != 0) == (counts._bitLength != 0));
     assert((counts._numDocs != 0) == (counts._bitLength != 0));
     assert(handle._bitOffsetMem <= handle._bitOffset);
@@ -87,16 +84,8 @@ createIterator(const PostingListCounts &counts,
 
 
 void
-ZcPosOccRandRead::readPostingList(const PostingListCounts &counts,
-                                  uint32_t firstSegment,
-                                  uint32_t numSegments,
-                                  PostingListHandle &handle)
+ZcPosOccRandRead::readPostingList(PostingListHandle &handle)
 {
-    // XXX: Ignore segments for now.
-    (void) firstSegment;
-    (void) numSegments;
-    (void) counts;
-
     handle.drop();
     if (handle._bitLength == 0) {
         return;
@@ -147,6 +136,7 @@ ZcPosOccRandRead::readPostingList(const PostingListCounts &counts,
         handle._mem = static_cast<char *>(alignedBuffer) + padBefore;
         handle._allocMem = mallocStart;
         handle._allocSize = mallocLen;
+        handle._read_bytes = padBefore + vectorLen + padAfter;
     }
     handle._bitOffsetMem = (startOffset << 3) - _headerBitSize;
 }
diff --git a/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.h b/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.h
index a1e2fbaa895e..5277e9fdda30 100644
--- a/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.h
+++ b/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.h
@@ -35,13 +35,12 @@ class ZcPosOccRandRead : public index::PostingListFileRandRead
      */
     std::unique_ptr<queryeval::SearchIterator>
     createIterator(const PostingListCounts &counts, const PostingListHandle &handle,
-                   const fef::TermFieldMatchDataArray &matchData, bool usebitVector) const override;
+                   const fef::TermFieldMatchDataArray &matchData) const override;
 
     /**
      * Read (possibly partial) posting list into handle.
      */
-    void readPostingList(const PostingListCounts &counts, uint32_t firstSegment,
-                         uint32_t numSegments, PostingListHandle &handle) override;
+    void readPostingList(PostingListHandle &handle) override;
 
     bool open(const std::string &name, const TuneFileRandRead &tuneFileRead) override;
     bool close() override;
diff --git a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
index f67af176ead6..f09e3dbbaac2 100644
--- a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
+++ b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
@@ -444,6 +444,22 @@ GlobalFilterUpperLimit::lookup(const Properties &props, double defaultValue)
     return lookupDouble(props, NAME, defaultValue);
 }
 
+const std::string WeakAndStopWordLimit::NAME("vespa.matching.weakand.stop_word_limit");
+
+const double WeakAndStopWordLimit::DEFAULT_VALUE(1.0);
+
+double
+WeakAndStopWordLimit::lookup(const Properties &props)
+{
+    return lookup(props, DEFAULT_VALUE);
+}
+
+double
+WeakAndStopWordLimit::lookup(const Properties &props, double defaultValue)
+{
+    return lookupDouble(props, NAME, defaultValue);
+}
+
 const std::string TargetHitsMaxAdjustmentFactor::NAME("vespa.matching.nns.target_hits_max_adjustment_factor");
 
 const double TargetHitsMaxAdjustmentFactor::DEFAULT_VALUE(20.0);
diff --git a/searchlib/src/vespa/searchlib/fef/indexproperties.h b/searchlib/src/vespa/searchlib/fef/indexproperties.h
index 7494eacb6282..c0904a94ff39 100644
--- a/searchlib/src/vespa/searchlib/fef/indexproperties.h
+++ b/searchlib/src/vespa/searchlib/fef/indexproperties.h
@@ -341,6 +341,16 @@ namespace matching {
         static double lookup(const Properties &props, double defaultValue);
     };
 
+    /**
+     * Property to control how much of the corpus a single term must match to be treated as a stop word by Vespa Wand
+     **/
+    struct WeakAndStopWordLimit {
+        static const std::string NAME;
+        static const double DEFAULT_VALUE;
+        static double lookup(const Properties &props);
+        static double lookup(const Properties &props, double defaultValue);
+    };
+
     /**
      * Property to control the algorithm using for fuzzy matching.
      **/
@@ -350,6 +360,7 @@ namespace matching {
         static vespalib::FuzzyMatchingAlgorithm lookup(const Properties& props);
         static vespalib::FuzzyMatchingAlgorithm lookup(const Properties& props, vespalib::FuzzyMatchingAlgorithm default_value);
     };
+
     /**
      * Sort blueprints based on relative cost estimate rather than est_hits
      **/
diff --git a/searchlib/src/vespa/searchlib/fef/ranksetup.cpp b/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
index 2410a86b2ab8..86232228864d 100644
--- a/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
+++ b/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
@@ -75,6 +75,7 @@ RankSetup::RankSetup(const BlueprintFactory &factory, const IIndexEnvironment &i
       _global_filter_upper_limit(1.0),
       _target_hits_max_adjustment_factor(20.0),
       _weakand_range(0.0),
+      _weakand_stop_word_limit(matching::WeakAndStopWordLimit::DEFAULT_VALUE),
       _fuzzy_matching_algorithm(vespalib::FuzzyMatchingAlgorithm::DfaTable),
       _mutateOnMatch(),
       _mutateOnFirstPhase(),
@@ -132,6 +133,7 @@ RankSetup::configure()
     set_target_hits_max_adjustment_factor(matching::TargetHitsMaxAdjustmentFactor::lookup(_indexEnv.getProperties()));
     set_fuzzy_matching_algorithm(matching::FuzzyAlgorithm::lookup(_indexEnv.getProperties()));
     set_weakand_range(temporary::WeakAndRange::lookup(_indexEnv.getProperties()));
+    set_weakand_stop_word_limit(matching::WeakAndStopWordLimit::lookup(_indexEnv.getProperties()));
     _mutateOnMatch._attribute = mutate::on_match::Attribute::lookup(_indexEnv.getProperties());
     _mutateOnMatch._operation = mutate::on_match::Operation::lookup(_indexEnv.getProperties());
     _mutateOnFirstPhase._attribute = mutate::on_first_phase::Attribute::lookup(_indexEnv.getProperties());
diff --git a/searchlib/src/vespa/searchlib/fef/ranksetup.h b/searchlib/src/vespa/searchlib/fef/ranksetup.h
index a0198b194cf9..8b656eb771f8 100644
--- a/searchlib/src/vespa/searchlib/fef/ranksetup.h
+++ b/searchlib/src/vespa/searchlib/fef/ranksetup.h
@@ -84,6 +84,7 @@ class RankSetup
     double                   _global_filter_upper_limit;
     double                   _target_hits_max_adjustment_factor;
     double                   _weakand_range;
+    double                   _weakand_stop_word_limit;
     vespalib::FuzzyMatchingAlgorithm _fuzzy_matching_algorithm;
     MutateOperation          _mutateOnMatch;
     MutateOperation          _mutateOnFirstPhase;
@@ -412,6 +413,8 @@ class RankSetup
     vespalib::FuzzyMatchingAlgorithm get_fuzzy_matching_algorithm() const { return _fuzzy_matching_algorithm; }
     void set_weakand_range(double v) { _weakand_range = v; }
     double get_weakand_range() const { return _weakand_range; }
+    void set_weakand_stop_word_limit(double v) { _weakand_stop_word_limit = v; }
+    double get_weakand_stop_word_limit() const { return _weakand_stop_word_limit; }
 
     /**
      * This method may be used to indicate that certain features
diff --git a/searchlib/src/vespa/searchlib/index/CMakeLists.txt b/searchlib/src/vespa/searchlib/index/CMakeLists.txt
index 00c809d8fdf8..4331ba0e4446 100644
--- a/searchlib/src/vespa/searchlib/index/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/index/CMakeLists.txt
@@ -1,6 +1,7 @@
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(searchlib_searchlib_index OBJECT
     SOURCES
+    dictionary_lookup_result.cpp
     dictionaryfile.cpp
     docidandfeatures.cpp
     dummyfileheadercontext.cpp
diff --git a/searchlib/src/vespa/searchlib/index/dictionary_lookup_result.cpp b/searchlib/src/vespa/searchlib/index/dictionary_lookup_result.cpp
new file mode 100644
index 000000000000..91cb3e240937
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/index/dictionary_lookup_result.cpp
@@ -0,0 +1,21 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "dictionary_lookup_result.h"
+
+namespace search::index {
+
+DictionaryLookupResult::DictionaryLookupResult() noexcept
+    : wordNum(0),
+      counts(),
+      bitOffset(0)
+{
+}
+
+DictionaryLookupResult::~DictionaryLookupResult() = default;
+
+void swap(DictionaryLookupResult& a, DictionaryLookupResult& b) noexcept
+{
+    a.swap(b);
+}
+
+}
diff --git a/searchlib/src/vespa/searchlib/index/dictionary_lookup_result.h b/searchlib/src/vespa/searchlib/index/dictionary_lookup_result.h
new file mode 100644
index 000000000000..99ca5232992e
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/index/dictionary_lookup_result.h
@@ -0,0 +1,32 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+#include "postinglistcounts.h"
+
+namespace search::index {
+
+/**
+ * The result after performing a disk dictionary lookup.
+ **/
+class DictionaryLookupResult {
+public:
+    uint64_t wordNum;
+    index::PostingListCounts counts;
+    uint64_t bitOffset;
+
+    DictionaryLookupResult() noexcept;
+    ~DictionaryLookupResult();
+
+    bool valid() const noexcept { return counts._numDocs > 0; }
+
+    void swap(DictionaryLookupResult &rhs) noexcept {
+        std::swap(wordNum, rhs.wordNum);
+        counts.swap(rhs.counts);
+        std::swap(bitOffset, rhs.bitOffset);
+    }
+};
+
+void swap(DictionaryLookupResult& a, DictionaryLookupResult& b) noexcept;
+
+}
diff --git a/searchlib/src/vespa/searchlib/index/postinglistfile.cpp b/searchlib/src/vespa/searchlib/index/postinglistfile.cpp
index dba6a977f68c..46410ce03af9 100644
--- a/searchlib/src/vespa/searchlib/index/postinglistfile.cpp
+++ b/searchlib/src/vespa/searchlib/index/postinglistfile.cpp
@@ -99,20 +99,16 @@ std::unique_ptr<search::queryeval::SearchIterator>
 PostingListFileRandReadPassThrough::
 createIterator(const PostingListCounts &counts,
                const PostingListHandle &handle,
-               const search::fef::TermFieldMatchDataArray &matchData,
-               bool usebitVector) const
+               const search::fef::TermFieldMatchDataArray &matchData) const
 {
-    return _lower->createIterator(counts, handle, matchData, usebitVector);
+    return _lower->createIterator(counts, handle, matchData);
 }
 
 void
 PostingListFileRandReadPassThrough::
-readPostingList(const PostingListCounts &counts,
-                uint32_t firstSegment,
-                uint32_t numSegments,
-                PostingListHandle &handle)
+readPostingList(PostingListHandle &handle)
 {
-    _lower->readPostingList(counts, firstSegment, numSegments,handle);
+    _lower->readPostingList(handle);
 }
 
 bool
diff --git a/searchlib/src/vespa/searchlib/index/postinglistfile.h b/searchlib/src/vespa/searchlib/index/postinglistfile.h
index 4c61d831a7a5..a53ff5a3fc59 100644
--- a/searchlib/src/vespa/searchlib/index/postinglistfile.h
+++ b/searchlib/src/vespa/searchlib/index/postinglistfile.h
@@ -150,18 +150,14 @@ class PostingListFileRandRead {
     virtual std::unique_ptr<search::queryeval::SearchIterator>
     createIterator(const PostingListCounts &counts,
                    const PostingListHandle &handle,
-                   const search::fef::TermFieldMatchDataArray &matchData,
-                   bool usebitVector) const = 0;
+                   const search::fef::TermFieldMatchDataArray &matchData) const = 0;
 
 
     /**
-     * Read (possibly partial) posting list into handle.
+     * Read posting list into handle.
      */
     virtual void
-    readPostingList(const PostingListCounts &counts,
-                    uint32_t firstSegment,
-                    uint32_t numSegments,
-                    PostingListHandle &handle) = 0;
+    readPostingList(PostingListHandle &handle) = 0;
 
     /**
      * Open posting list file for random read.
@@ -197,11 +193,9 @@ class PostingListFileRandReadPassThrough : public PostingListFileRandRead {
     std::unique_ptr<search::queryeval::SearchIterator>
     createIterator(const PostingListCounts &counts,
                    const PostingListHandle &handle,
-                   const search::fef::TermFieldMatchDataArray &matchData,
-                   bool usebitVector) const override;
+                   const search::fef::TermFieldMatchDataArray &matchData) const override;
 
-    void readPostingList(const PostingListCounts &counts, uint32_t firstSegment,
-                         uint32_t numSegments, PostingListHandle &handle) override;
+    void readPostingList(PostingListHandle &handle) override;
 
     bool open(const std::string &name, const TuneFileRandRead &tuneFileRead) override;
     bool close() override;
diff --git a/searchlib/src/vespa/searchlib/index/postinglisthandle.cpp b/searchlib/src/vespa/searchlib/index/postinglisthandle.cpp
index 6ab59b574043..193580b4aa7f 100644
--- a/searchlib/src/vespa/searchlib/index/postinglisthandle.cpp
+++ b/searchlib/src/vespa/searchlib/index/postinglisthandle.cpp
@@ -8,10 +8,9 @@ namespace search::index {
 
 std::unique_ptr<search::queryeval::SearchIterator>
 PostingListHandle::createIterator(const PostingListCounts &counts,
-                                  const search::fef::TermFieldMatchDataArray &matchData,
-                                  bool useBitVector) const
+                                  const search::fef::TermFieldMatchDataArray &matchData) const
 {
-    return _file->createIterator(counts, *this, matchData, useBitVector);
+    return _file->createIterator(counts, *this, matchData);
 }
 
 }
diff --git a/searchlib/src/vespa/searchlib/index/postinglisthandle.h b/searchlib/src/vespa/searchlib/index/postinglisthandle.h
index a23ae3dcc3f5..ace1e16f766b 100644
--- a/searchlib/src/vespa/searchlib/index/postinglisthandle.h
+++ b/searchlib/src/vespa/searchlib/index/postinglisthandle.h
@@ -27,23 +27,21 @@ class PostingListHandle {
     uint64_t _bitLength;    // Length of posting list, in bits
 
     // Value portion
-    uint32_t _firstSegment; // First segment for word
-    uint32_t _numSegments;  // Number of segments
     uint64_t _bitOffsetMem; // _mem relative to start of file
     const void *_mem;       // Memory backing posting list after read/mmap
     void *_allocMem;        // What to free after posting list
     size_t _allocSize;      // Size of allocated memory
+    uint64_t _read_bytes;   // Bytes read from disk (used by disk io stats)
 
     PostingListHandle()
     : _file(nullptr),
       _bitOffset(0),
       _bitLength(0),
-      _firstSegment(0),
-      _numSegments(0),
       _bitOffsetMem(0),
       _mem(nullptr),
       _allocMem(nullptr),
-      _allocSize(0)
+      _allocSize(0),
+      _read_bytes(0)
     { }
 
     ~PostingListHandle()
@@ -56,22 +54,15 @@ class PostingListHandle {
     /**
      * Create iterator for single word.  Semantic lifetime of counts and
      * handle must exceed lifetime of iterator.
-     *
-     * XXX: TODO: How to read next set of segments from disk if handle
-     * didn't cover the whole word, probably need access to higher level
-     * API above caches.
      */
     std::unique_ptr<search::queryeval::SearchIterator>
     createIterator(const PostingListCounts &counts,
-                   const search::fef::TermFieldMatchDataArray &matchData,
-                   bool useBitVector=false) const;
+                   const search::fef::TermFieldMatchDataArray &matchData) const;
 
     /**
      * Drop value portion of handle.
      */
     void drop() {
-        _firstSegment = 0;
-        _numSegments = 0;
         _bitOffsetMem = 0;
         _mem = nullptr;
         if (_allocMem != nullptr) {
@@ -79,6 +70,7 @@ class PostingListHandle {
             _allocMem = nullptr;
         }
         _allocSize = 0;
+        _read_bytes = 0;
     }
 };
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp
index 0e52bf93369a..972bb6102255 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp
@@ -58,7 +58,7 @@ DocumentInverter::~DocumentInverter()
 }
 
 void
-DocumentInverter::invertDocument(uint32_t docId, const Document &doc, OnWriteDoneType on_write_done)
+DocumentInverter::invertDocument(uint32_t docId, const Document &doc, const OnWriteDoneType& on_write_done)
 {
     auto& invert_threads = _context.get_invert_threads();
     auto& invert_contexts = _context.get_invert_contexts();
@@ -88,7 +88,7 @@ DocumentInverter::removeDocuments(LidVector lids)
 }
 
 void
-DocumentInverter::pushDocuments(OnWriteDoneType on_write_done)
+DocumentInverter::pushDocuments(const OnWriteDoneType& on_write_done)
 {
     auto retain = std::make_shared<RetainGuard>(_ref_count);
     using PushTasks = std::vector<std::shared_ptr<ScheduleSequencedTaskCallback>>;
diff --git a/searchlib/src/vespa/searchlib/memoryindex/document_inverter.h b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.h
index c389e76b985e..3b15c7640397 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/document_inverter.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.h
@@ -38,7 +38,7 @@ class DocumentInverter {
     DocumentInverterContext& _context;
 
     using LidVector = std::vector<uint32_t>;
-    using OnWriteDoneType = const std::shared_ptr<vespalib::IDestructorCallback> &;
+    using OnWriteDoneType = std::shared_ptr<vespalib::IDestructorCallback>;
 
     std::vector<std::unique_ptr<FieldInverter>> _inverters;
     std::vector<std::unique_ptr<UrlFieldInverter>> _urlInverters;
@@ -66,7 +66,7 @@ class DocumentInverter {
      * NOTE: The caller of this function should sync the 'invert threads' executor first,
      * to ensure that inverting is completed before pushing starts.
      */
-    void pushDocuments(OnWriteDoneType on_write_done);
+    void pushDocuments(const OnWriteDoneType& on_write_done);
 
     /**
      * Invert (add) the given document.
@@ -75,7 +75,7 @@ class DocumentInverter {
      * For each text and uri field in the document a task for inverting and adding that
      * field (using a field inverter) is added to the 'invert threads' executor, then this function returns.
      **/
-    void invertDocument(uint32_t docId, const document::Document &doc, OnWriteDoneType on_write_done);
+    void invertDocument(uint32_t docId, const document::Document &doc, const OnWriteDoneType& on_write_done);
 
     /**
      * Remove the given document.
diff --git a/searchlib/src/vespa/searchlib/memoryindex/invert_task.cpp b/searchlib/src/vespa/searchlib/memoryindex/invert_task.cpp
index d0f63ac3cd69..b97f2b2e7cec 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/invert_task.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/invert_task.cpp
@@ -25,7 +25,7 @@ get_field_value(const Document& doc, const std::unique_ptr<const Field>& field)
 
 }
 
-InvertTask::InvertTask(const DocumentInverterContext& inv_context, const InvertContext& context, const std::vector<std::unique_ptr<FieldInverter>>& inverters,  const std::vector<std::unique_ptr<UrlFieldInverter>>& uri_inverters, uint32_t lid, const document::Document& doc, OnWriteDoneType on_write_done)
+InvertTask::InvertTask(const DocumentInverterContext& inv_context, const InvertContext& context, const std::vector<std::unique_ptr<FieldInverter>>& inverters, const std::vector<std::unique_ptr<UrlFieldInverter>>& uri_inverters, uint32_t lid, const document::Document& doc, const OnWriteDoneType& on_write_done)
     : _inv_context(inv_context),
       _context(context),
       _inverters(inverters),
diff --git a/searchlib/src/vespa/searchlib/memoryindex/invert_task.h b/searchlib/src/vespa/searchlib/memoryindex/invert_task.h
index 840d0d0daa79..2a415ebfd193 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/invert_task.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/invert_task.h
@@ -21,16 +21,16 @@ class UrlFieldInverter;
  */
 class InvertTask : public vespalib::Executor::Task
 {
-    using OnWriteDoneType = const std::shared_ptr<vespalib::IDestructorCallback> &;
+    using OnWriteDoneType = std::shared_ptr<vespalib::IDestructorCallback>;
     const DocumentInverterContext&                        _inv_context;
     const InvertContext&                                  _context;
     const std::vector<std::unique_ptr<FieldInverter>>&    _inverters;
     const std::vector<std::unique_ptr<UrlFieldInverter>>& _uri_inverters;
     const document::Document&                             _doc;
     const uint32_t                                        _lid;
-    std::remove_reference_t<OnWriteDoneType>              _on_write_done;
+    const OnWriteDoneType                                 _on_write_done;
 public:
-    InvertTask(const DocumentInverterContext& inv_context, const InvertContext& context, const std::vector<std::unique_ptr<FieldInverter>>& inverters,  const std::vector<std::unique_ptr<UrlFieldInverter>>& uri_inverters, uint32_t lid, const document::Document& doc, OnWriteDoneType on_write_done);
+    InvertTask(const DocumentInverterContext& inv_context, const InvertContext& context, const std::vector<std::unique_ptr<FieldInverter>>& inverters, const std::vector<std::unique_ptr<UrlFieldInverter>>& uri_inverters, uint32_t lid, const document::Document& doc, const OnWriteDoneType& on_write_done);
     ~InvertTask() override;
     void run() override;
 };
diff --git a/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp b/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp
index 2e53b306d0c3..9ffa03a7fd12 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp
@@ -78,7 +78,7 @@ MemoryIndex::MemoryIndex(const Schema& schema,
 MemoryIndex::~MemoryIndex() = default;
 
 void
-MemoryIndex::insertDocument(uint32_t docId, const document::Document &doc, OnWriteDoneType on_write_done)
+MemoryIndex::insertDocument(uint32_t docId, const document::Document &doc, const OnWriteDoneType& on_write_done)
 {
     if (_frozen) {
         LOG(warning, "Memory index frozen: ignoring insert of document '%s'(%u): '%s'",
@@ -112,7 +112,7 @@ MemoryIndex::removeDocuments(LidVector lids)
 }
 
 void
-MemoryIndex::commit(OnWriteDoneType on_write_done)
+MemoryIndex::commit(const OnWriteDoneType& on_write_done)
 {
     auto& inverter = _inverters->get_active_inverter();
     inverter.pushDocuments(on_write_done);
@@ -236,7 +236,7 @@ MemoryIndex::pruneRemovedFields(const Schema &schema)
     }
 }
 
-Schema::SP
+std::shared_ptr<const Schema>
 MemoryIndex::getPrunedSchema() const
 {
     std::lock_guard lock(_lock);
diff --git a/searchlib/src/vespa/searchlib/memoryindex/memory_index.h b/searchlib/src/vespa/searchlib/memoryindex/memory_index.h
index 6ac34657ad73..1495c47ba78f 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/memory_index.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/memory_index.h
@@ -45,7 +45,7 @@ class MemoryIndex : public queryeval::Searchable {
 private:
     using ISequencedTaskExecutor = vespalib::ISequencedTaskExecutor;
     using LidVector = std::vector<uint32_t>;
-    using OnWriteDoneType = const std::shared_ptr<vespalib::IDestructorCallback> &;
+    using OnWriteDoneType = std::shared_ptr<vespalib::IDestructorCallback>;
     index::Schema     _schema;
     ISequencedTaskExecutor &_invertThreads;
     ISequencedTaskExecutor &_pushThreads;
@@ -57,7 +57,7 @@ class MemoryIndex : public queryeval::Searchable {
     std::atomic<uint32_t> _numDocs;
     mutable std::mutex  _lock;
     std::vector<bool>   _hiddenFields;
-    index::Schema::SP   _prunedSchema;
+    std::shared_ptr<const index::Schema> _prunedSchema;
     vespalib::hash_set<uint32_t> _indexedDocs; // documents in memory index
     const uint64_t      _staticMemoryFootprint;
 
@@ -111,7 +111,7 @@ class MemoryIndex : public queryeval::Searchable {
      * If the document is already in the index, the old version will be removed first.
      * This function is async. commit() must be called for changes to take effect.
      */
-    void insertDocument(uint32_t docId, const document::Document &doc, OnWriteDoneType on_write_done);
+    void insertDocument(uint32_t docId, const document::Document &doc, const OnWriteDoneType& on_write_done);
 
     /**
      * Remove a document from the underlying field indexes.
@@ -125,7 +125,7 @@ class MemoryIndex : public queryeval::Searchable {
      *
      * When commit is completed, 'on_write_done' goes out of scope, scheduling completion callback.
      */
-    void commit(OnWriteDoneType on_write_done);
+    void commit(const OnWriteDoneType& on_write_done);
 
     /**
      * Freeze this index.
@@ -165,7 +165,7 @@ class MemoryIndex : public queryeval::Searchable {
 
     void pruneRemovedFields(const index::Schema &schema);
 
-    index::Schema::SP getPrunedSchema() const;
+    std::shared_ptr<const index::Schema> getPrunedSchema() const;
 
     /**
      * Gets an approximation of how much memory the index uses.
diff --git a/searchlib/src/vespa/searchlib/memoryindex/push_task.cpp b/searchlib/src/vespa/searchlib/memoryindex/push_task.cpp
index 52f9e59b76e1..28afa7cdbacc 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/push_task.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/push_task.cpp
@@ -19,7 +19,7 @@ void push_inverter(Inverter& inverter)
 }
 
 
-PushTask::PushTask(const PushContext& context, const std::vector<std::unique_ptr<FieldInverter>>& inverters,  const std::vector<std::unique_ptr<UrlFieldInverter>>& uri_inverters, OnWriteDoneType on_write_done, std::shared_ptr<vespalib::RetainGuard> retain)
+PushTask::PushTask(const PushContext& context, const std::vector<std::unique_ptr<FieldInverter>>& inverters, const std::vector<std::unique_ptr<UrlFieldInverter>>& uri_inverters, const OnWriteDoneType& on_write_done, std::shared_ptr<vespalib::RetainGuard> retain)
     : _context(context),
       _inverters(inverters),
       _uri_inverters(uri_inverters),
diff --git a/searchlib/src/vespa/searchlib/memoryindex/push_task.h b/searchlib/src/vespa/searchlib/memoryindex/push_task.h
index 10e8dd324102..34d65621623e 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/push_task.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/push_task.h
@@ -22,14 +22,14 @@ class UrlFieldInverter;
  */
 class PushTask : public vespalib::Executor::Task
 {
-    using OnWriteDoneType = const std::shared_ptr<vespalib::IDestructorCallback> &;
+    using OnWriteDoneType = std::shared_ptr<vespalib::IDestructorCallback>;
     const PushContext&                                    _context;
     const std::vector<std::unique_ptr<FieldInverter>>&    _inverters;
     const std::vector<std::unique_ptr<UrlFieldInverter>>& _uri_inverters;
-    std::remove_reference_t<OnWriteDoneType>              _on_write_done;
+    const OnWriteDoneType                                 _on_write_done;
     std::shared_ptr<vespalib::RetainGuard>                _retain;
 public:
-    PushTask(const PushContext& context, const std::vector<std::unique_ptr<FieldInverter>>& inverters,  const std::vector<std::unique_ptr<UrlFieldInverter>>& uri_inverters, OnWriteDoneType on_write_done, std::shared_ptr<vespalib::RetainGuard> retain);
+    PushTask(const PushContext& context, const std::vector<std::unique_ptr<FieldInverter>>& inverters, const std::vector<std::unique_ptr<UrlFieldInverter>>& uri_inverters, const OnWriteDoneType& on_write_done, std::shared_ptr<vespalib::RetainGuard> retain);
     ~PushTask() override;
     void run() override;
 };
diff --git a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp
index 72feeaebc13a..dab867a79ee0 100644
--- a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp
@@ -419,10 +419,11 @@ WeakAndBlueprint::my_flow(InFlow in_flow) const
     return AnyFlow::create<OrFlow>(in_flow);
 }
 
-WeakAndBlueprint::WeakAndBlueprint(uint32_t n, float idf_range, bool thread_safe)
+WeakAndBlueprint::WeakAndBlueprint(uint32_t n, float idf_range, uint32_t abs_stop_word_limit, bool thread_safe)
     : _scores(WeakAndPriorityQueue::createHeap(n, thread_safe)),
       _n(n),
       _idf_range(idf_range),
+      _abs_stop_word_limit(abs_stop_word_limit),
       _weights(),
       _matching_phase(MatchingPhase::FIRST_PHASE)
 {}
diff --git a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.h b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.h
index 016ee67cac8c..0e74b8edf1fa 100644
--- a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.h
+++ b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.h
@@ -92,6 +92,7 @@ class WeakAndBlueprint : public IntermediateBlueprint
     std::unique_ptr<WeakAndPriorityQueue>  _scores;
     uint32_t              _n;
     float                 _idf_range;
+    uint32_t              _abs_stop_word_limit;
     std::vector<uint32_t> _weights;
     MatchingPhase         _matching_phase;
 
@@ -109,8 +110,8 @@ class WeakAndBlueprint : public IntermediateBlueprint
                              fef::MatchData &md) const override;
     SearchIterator::UP createFilterSearch(FilterConstraint constraint) const override;
 
-    explicit WeakAndBlueprint(uint32_t n) : WeakAndBlueprint(n, 0.0, true) {}
-    WeakAndBlueprint(uint32_t n, float idf_range, bool thread_safe);
+    explicit WeakAndBlueprint(uint32_t n) : WeakAndBlueprint(n, 0.0, -1, true) {}
+    WeakAndBlueprint(uint32_t n, float idf_range, uint32_t abs_stop_word_limit, bool thread_safe);
     ~WeakAndBlueprint() override;
     void addTerm(Blueprint::UP bp, uint32_t weight) {
         addChild(std::move(bp));
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h
index 130bd46f470f..0fae6be9d144 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h
@@ -29,7 +29,7 @@ struct ParallelWeakAndSearch : public SearchIterator
                     double thresholdBoostFactor_in,
                     uint32_t scoresAdjustFrequency_in,
                     uint32_t docIdLimit_in) noexcept
-            : wand::MatchParams(scores_in, scoreThreshold_in, scoresAdjustFrequency_in),
+            : wand::MatchParams(scores_in, scoreThreshold_in, -1, scoresAdjustFrequency_in),
               thresholdBoostFactor(thresholdBoostFactor_in),
               docIdLimit(docIdLimit_in)
         {}
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h b/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h
index 69b6c4d78ce4..2abb0ed8bc83 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h
@@ -35,13 +35,15 @@ struct MatchParams
 {
     WeakAndHeap   &scores;
     score_t        scoreThreshold;
+    uint32_t       abs_stop_word_limit;
     const uint32_t scoresAdjustFrequency;
     MatchParams(WeakAndHeap &scores_in) noexcept
-        : MatchParams(scores_in, 1, DEFAULT_PARALLEL_WAND_SCORES_ADJUST_FREQUENCY)
+        : MatchParams(scores_in, 1, -1, DEFAULT_PARALLEL_WAND_SCORES_ADJUST_FREQUENCY)
     {}
-    MatchParams(WeakAndHeap &scores_in, score_t scoreThreshold_in, uint32_t scoresAdjustFrequency_in) noexcept
+    MatchParams(WeakAndHeap &scores_in, score_t scoreThreshold_in, uint32_t abs_stop_word_limit_in, uint32_t scoresAdjustFrequency_in) noexcept
         : scores(scores_in),
           scoreThreshold(scoreThreshold_in),
+          abs_stop_word_limit(abs_stop_word_limit_in),
           scoresAdjustFrequency(scoresAdjustFrequency_in)
     {}
 };
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_search.cpp b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_search.cpp
index 6f0a4b8f8259..23e35e13d653 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_search.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_search.cpp
@@ -10,6 +10,23 @@
 namespace search::queryeval {
 namespace wand {
 
+score_t calculate_initial_wand_threshold(const auto &scorer, const Terms &terms, const MatchParams &matchParams) {
+    std::optional<score_t> best_stop_word;
+    std::optional<score_t> worst_normal_word;
+    for (const auto &t: terms) {
+        score_t s = scorer.calculateMaxScore(t);
+        if (t.estHits > matchParams.abs_stop_word_limit) {
+            best_stop_word = std::max(s, best_stop_word.value_or(s));
+        } else {
+            worst_normal_word = std::min(s, worst_normal_word.value_or(s));
+        }
+    }
+    score_t limit = matchParams.scoreThreshold;
+    limit = std::max(limit, best_stop_word.value_or(limit));
+    limit = std::max(limit, worst_normal_word.value_or(limit));
+    return limit;
+}
+
 template <typename FutureHeap, typename PastHeap, bool IS_STRICT>
 class WeakAndSearchLR final : public WeakAndSearch
 {
@@ -54,7 +71,7 @@ class WeakAndSearchLR final : public WeakAndSearch
         : _terms(terms, scorer, 0, {}),
           _heaps(DocIdOrder(_terms.docId()), _terms.size()),
           _algo(),
-          _threshold(matchParams.scoreThreshold),
+          _threshold(calculate_initial_wand_threshold(scorer, terms, matchParams)),
           _matchParams(matchParams),
           _localScores(),
           _n(n),
diff --git a/searchlib/src/vespa/searchlib/util/CMakeLists.txt b/searchlib/src/vespa/searchlib/util/CMakeLists.txt
index a90ca1191dd8..b863d7307401 100644
--- a/searchlib/src/vespa/searchlib/util/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/util/CMakeLists.txt
@@ -5,8 +5,10 @@ vespa_add_library(searchlib_util OBJECT
     comprbuffer.cpp
     comprfile.cpp
     data_buffer_writer.cpp
+    disk_io_stats.cpp
     dirtraverse.cpp
     drainingbufferwriter.cpp
+    field_index_stats.cpp
     file_with_header.cpp
     filealign.cpp
     fileheadertk.cpp
@@ -17,6 +19,7 @@ vespa_add_library(searchlib_util OBJECT
     linguisticsannotation.cpp
     logutil.cpp
     rawbuf.cpp
+    searchable_stats.cpp
     slime_output_raw_buf_adapter.cpp
     state_explorer_utils.cpp
     token_extractor.cpp
diff --git a/searchlib/src/vespa/searchlib/util/disk_io_stats.cpp b/searchlib/src/vespa/searchlib/util/disk_io_stats.cpp
new file mode 100644
index 000000000000..40749b46cf31
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/util/disk_io_stats.cpp
@@ -0,0 +1,15 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "disk_io_stats.h"
+#include <ostream>
+
+namespace search {
+
+std::ostream& operator<<(std::ostream& os, const DiskIoStats& stats) {
+    os << "{read_operations: " << stats.read_operations() << ", read_bytes: " <<
+       "{total: " << stats.read_bytes_total() << ", min: " << stats.read_bytes_min() <<
+       ", max: " << stats.read_bytes_max() << "}}";
+    return os;
+}
+
+}
diff --git a/searchlib/src/vespa/searchlib/util/disk_io_stats.h b/searchlib/src/vespa/searchlib/util/disk_io_stats.h
new file mode 100644
index 000000000000..07add12dadc9
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/util/disk_io_stats.h
@@ -0,0 +1,76 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#pragma once
+
+#include <algorithm>
+#include <cstdint>
+#include <iosfwd>
+
+namespace search {
+
+/*
+ * Class tracking disk io.
+ */
+class DiskIoStats {
+    uint64_t _read_operations;
+    uint64_t _read_bytes_total;
+    uint64_t _read_bytes_min;
+    uint64_t _read_bytes_max;
+
+public:
+    DiskIoStats() noexcept
+        : _read_operations(0),
+          _read_bytes_total(0),
+          _read_bytes_min(0),
+          _read_bytes_max(0)
+    {}
+
+    void add_read_operation(uint64_t bytes) noexcept {
+        if (++_read_operations == 1) {
+            _read_bytes_total = bytes;
+            _read_bytes_min = bytes;
+            _read_bytes_max = bytes;
+        } else {
+            _read_bytes_total += bytes;
+            _read_bytes_min = std::min(_read_bytes_min, bytes);
+            _read_bytes_max = std::max(_read_bytes_max, bytes);
+        }
+    }
+    void merge(const DiskIoStats& rhs) noexcept {
+        if (rhs._read_operations != 0) {
+            if (_read_operations == 0) {
+                *this = rhs;
+            } else {
+                _read_operations += rhs._read_operations;
+                _read_bytes_total += rhs._read_bytes_total;
+                _read_bytes_min = std::min(_read_bytes_min, rhs._read_bytes_min);
+                _read_bytes_max = std::max(_read_bytes_max, rhs._read_bytes_max);
+            }
+        }
+    }
+    bool operator==(const DiskIoStats& rhs) const noexcept {
+        return _read_operations == rhs._read_operations &&
+               _read_bytes_total == rhs._read_bytes_total &&
+               _read_bytes_min == rhs._read_bytes_min &&
+               _read_bytes_max == rhs._read_bytes_max;
+    }
+    void clear() noexcept {
+        _read_operations = 0;
+        _read_bytes_total = 0;
+        _read_bytes_min = 0;
+        _read_bytes_max = 0;
+    }
+    DiskIoStats read_and_clear() noexcept { auto result = *this; clear(); return result; }
+
+    DiskIoStats& read_operations(uint64_t value) { _read_operations = value; return *this; }
+    DiskIoStats& read_bytes_total(uint64_t value) { _read_bytes_total = value; return *this; }
+    DiskIoStats& read_bytes_min(uint64_t value) { _read_bytes_min = value; return *this; }
+    DiskIoStats& read_bytes_max(uint64_t value) { _read_bytes_max = value; return *this; }
+    uint64_t read_operations() const noexcept { return _read_operations; }
+    uint64_t read_bytes_total() const noexcept { return _read_bytes_total; }
+    uint64_t read_bytes_min() const noexcept { return _read_bytes_min; }
+    uint64_t read_bytes_max() const noexcept { return _read_bytes_max; }
+};
+
+std::ostream& operator<<(std::ostream& os, const DiskIoStats& stats);
+
+}
diff --git a/searchlib/src/vespa/searchlib/util/field_index_stats.cpp b/searchlib/src/vespa/searchlib/util/field_index_stats.cpp
new file mode 100644
index 000000000000..9cd4fed304f5
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/util/field_index_stats.cpp
@@ -0,0 +1,14 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "field_index_stats.h"
+#include <ostream>
+
+namespace search {
+
+std::ostream& operator<<(std::ostream& os, const FieldIndexStats& stats) {
+    os << "{memory: " << stats.memory_usage() << ", disk: " << stats.size_on_disk() <<
+    ", diskio: " << stats.disk_io_stats() << "}";
+    return os;
+}
+
+}
diff --git a/searchlib/src/vespa/searchlib/util/field_index_stats.h b/searchlib/src/vespa/searchlib/util/field_index_stats.h
new file mode 100644
index 000000000000..d0845a29d987
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/util/field_index_stats.h
@@ -0,0 +1,55 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#pragma once
+
+#include "disk_io_stats.h"
+#include <vespa/vespalib/util/memoryusage.h>
+#include <iosfwd>
+
+namespace search {
+
+/**
+ * Statistics for a single field index.
+ **/
+class FieldIndexStats
+{
+private:
+    vespalib::MemoryUsage _memory_usage;
+    size_t _size_on_disk; // in bytes
+    DiskIoStats _disk_io_stats;
+
+public:
+    FieldIndexStats() noexcept
+        : _memory_usage(),
+          _size_on_disk(0),
+          _disk_io_stats()
+    {}
+    FieldIndexStats &memory_usage(const vespalib::MemoryUsage &usage) noexcept {
+        _memory_usage = usage;
+        return *this;
+    }
+    const vespalib::MemoryUsage &memory_usage() const noexcept { return _memory_usage; }
+    FieldIndexStats &size_on_disk(size_t value) noexcept {
+        _size_on_disk = value;
+        return *this;
+    }
+    size_t size_on_disk() const noexcept { return _size_on_disk; }
+
+    FieldIndexStats& disk_io_stats(const DiskIoStats& stats) { _disk_io_stats = stats; return *this; }
+    const DiskIoStats& disk_io_stats() const noexcept { return _disk_io_stats; }
+
+    void merge(const FieldIndexStats &rhs) noexcept {
+        _memory_usage.merge(rhs._memory_usage);
+        _size_on_disk += rhs._size_on_disk;
+        _disk_io_stats.merge(rhs._disk_io_stats);
+    }
+
+    bool operator==(const FieldIndexStats& rhs) const noexcept {
+        return _memory_usage == rhs._memory_usage &&
+        _size_on_disk == rhs._size_on_disk &&
+        _disk_io_stats == rhs._disk_io_stats;
+    }
+};
+
+std::ostream& operator<<(std::ostream& os, const FieldIndexStats& stats);
+
+}
diff --git a/searchlib/src/vespa/searchlib/util/searchable_stats.cpp b/searchlib/src/vespa/searchlib/util/searchable_stats.cpp
new file mode 100644
index 000000000000..d82e1ccf3e3f
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/util/searchable_stats.cpp
@@ -0,0 +1,64 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "searchable_stats.h"
+#include <ostream>
+
+namespace search {
+
+SearchableStats::SearchableStats()
+    : _memoryUsage(),
+      _docsInMemory(0),
+      _sizeOnDisk(0),
+      _fusion_size_on_disk(0),
+      _field_stats()
+{
+}
+
+SearchableStats::~SearchableStats() = default;
+
+SearchableStats&
+SearchableStats::merge(const SearchableStats &rhs) {
+    _memoryUsage.merge(rhs._memoryUsage);
+    _docsInMemory += rhs._docsInMemory;
+    _sizeOnDisk += rhs._sizeOnDisk;
+    _fusion_size_on_disk += rhs._fusion_size_on_disk;
+    for (auto& rhs_field : rhs._field_stats) {
+        _field_stats[rhs_field.first].merge(rhs_field.second);
+    }
+    return *this;
+}
+
+bool
+SearchableStats::operator==(const SearchableStats& rhs) const noexcept
+{
+    return _memoryUsage == rhs._memoryUsage &&
+    _docsInMemory == rhs._docsInMemory &&
+    _sizeOnDisk == rhs._sizeOnDisk &&
+    _fusion_size_on_disk == rhs._fusion_size_on_disk &&
+    _field_stats == rhs._field_stats;
+}
+
+SearchableStats&
+SearchableStats::add_field_stats(const std::string& name, const FieldIndexStats& stats)
+{
+    _field_stats[name].merge(stats);
+    return *this;
+}
+
+std::ostream& operator<<(std::ostream& os, const SearchableStats& stats) {
+    os << "{memory: " << stats.memoryUsage() << ", docsInMemory: " << stats.docsInMemory() <<
+       ", disk: " << stats.sizeOnDisk() << ", fusion_size_on_disk: " << stats.fusion_size_on_disk() << ", ";
+    os << "fields: {";
+    bool first = true;
+    for (auto& field : stats.get_field_stats()) {
+        if (!first) {
+            os << ", ";
+        }
+        first = false;
+        os << "\"" << field.first << "\": " << field.second;
+    }
+    os << "}";
+    return os;
+}
+
+}
diff --git a/searchlib/src/vespa/searchlib/util/searchable_stats.h b/searchlib/src/vespa/searchlib/util/searchable_stats.h
index 089c44144930..1cbd7645bbdd 100644
--- a/searchlib/src/vespa/searchlib/util/searchable_stats.h
+++ b/searchlib/src/vespa/searchlib/util/searchable_stats.h
@@ -1,7 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/vespalib/util/memoryusage.h>
+#include "field_index_stats.h"
+#include <map>
 
 namespace search {
 
@@ -17,9 +18,11 @@ class SearchableStats
     size_t _docsInMemory;
     size_t _sizeOnDisk; // in bytes
     size_t _fusion_size_on_disk; // in bytes
+    std::map<std::string, FieldIndexStats> _field_stats;
 
 public:
-    SearchableStats() : _memoryUsage(), _docsInMemory(0), _sizeOnDisk(0), _fusion_size_on_disk(0) {}
+    SearchableStats();
+    ~SearchableStats();
     SearchableStats &memoryUsage(const vespalib::MemoryUsage &usage) {
         _memoryUsage = usage;
         return *this;
@@ -41,14 +44,12 @@ class SearchableStats
     }
     size_t fusion_size_on_disk() const { return _fusion_size_on_disk; }
 
-    SearchableStats &merge(const SearchableStats &rhs) {
-        _memoryUsage.merge(rhs._memoryUsage);
-        _docsInMemory += rhs._docsInMemory;
-        _sizeOnDisk += rhs._sizeOnDisk;
-        _fusion_size_on_disk += rhs._fusion_size_on_disk;
-        return *this;
-    }
+    SearchableStats& merge(const SearchableStats& rhs);
+    bool operator==(const SearchableStats& rhs) const noexcept;
+    SearchableStats& add_field_stats(const std::string& name, const FieldIndexStats& stats);
+    const std::map<std::string, FieldIndexStats>& get_field_stats() const noexcept { return _field_stats; }
 };
 
-} // namespace search
+std::ostream& operator<<(std::ostream& os, const SearchableStats& stats);
 
+}
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AwsTemporaryCredentials.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AwsTemporaryCredentials.java
index b3b415704ae5..0c954f5704f4 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AwsTemporaryCredentials.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AwsTemporaryCredentials.java
@@ -6,32 +6,8 @@
 /**
  * @author mortent
  */
-public class AwsTemporaryCredentials {
-    private final String accessKeyId;
-    private final String secretAccessKey;
-    private final String sessionToken;
-    private final Instant expiration;
-
-    public AwsTemporaryCredentials(String accessKeyId, String secretAccessKey, String sessionToken, Instant expiration) {
-        this.accessKeyId = accessKeyId;
-        this.secretAccessKey = secretAccessKey;
-        this.sessionToken = sessionToken;
-        this.expiration = expiration;
-    }
-
-    public String accessKeyId() {
-        return accessKeyId;
-    }
-
-    public String secretAccessKey() {
-        return secretAccessKey;
-    }
-
-    public String sessionToken() {
-        return sessionToken;
-    }
-
-    public Instant expiration() {
-        return expiration;
-    }
+public record AwsTemporaryCredentials(String accessKeyId,
+                                      String secretAccessKey,
+                                      String sessionToken,
+                                      Instant expiration) {
 }
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AzureTemporaryCredentials.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AzureTemporaryCredentials.java
new file mode 100644
index 000000000000..69103aea3a20
--- /dev/null
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AzureTemporaryCredentials.java
@@ -0,0 +1,13 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.athenz.api;
+
+import java.time.Instant;
+
+/**
+ * @author freva
+ */
+public record AzureTemporaryCredentials(String azureSubscription,
+                                        String azureTenant,
+                                        String accessToken,
+                                        Instant expiration) {
+}
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java
index f054abf2bd14..47f7961c38d5 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java
@@ -1,7 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.athenz.client.zms;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yahoo.athenz.auth.util.Crypto;
 import com.yahoo.security.KeyUtils;
 import com.yahoo.vespa.athenz.api.AthenzAssertion;
@@ -52,8 +51,6 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static com.yahoo.yolean.Exceptions.uncheck;
-
 
 /**
  * @author bjorncs
@@ -231,10 +228,9 @@ public AthenzDomainMeta getDomainMeta(AthenzDomain domain) {
 
     @Override
     public void updateDomain(AthenzDomain domain, String mainKey, Map<String, Object> attributes) {
-        String domainMeta = uncheck(() -> new ObjectMapper().writeValueAsString(attributes));
         HttpUriRequest request = RequestBuilder.put()
                                                .setUri(zmsUrl.resolve("domain/%s/meta/system/%s".formatted(domain.getName(), mainKey)))
-                                               .setEntity(new StringEntity(domainMeta, ContentType.APPLICATION_JSON))
+                                               .setEntity(toJsonStringEntity(attributes))
                                                .build();
         execute(request, response -> readEntity(response, Void.class));
     }
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
index 57759d620d7e..a573368e1aba 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
@@ -9,6 +9,7 @@
 import com.yahoo.vespa.athenz.api.AthenzRole;
 import com.yahoo.vespa.athenz.api.AwsRole;
 import com.yahoo.vespa.athenz.api.AwsTemporaryCredentials;
+import com.yahoo.vespa.athenz.api.AzureTemporaryCredentials;
 import com.yahoo.vespa.athenz.api.NToken;
 import com.yahoo.vespa.athenz.api.ZToken;
 import com.yahoo.vespa.athenz.client.ErrorHandler;
@@ -16,6 +17,7 @@
 import com.yahoo.vespa.athenz.client.zms.bindings.AccessResponseEntity;
 import com.yahoo.vespa.athenz.client.zts.bindings.AccessTokenResponseEntity;
 import com.yahoo.vespa.athenz.client.zts.bindings.AwsTemporaryCredentialsResponseEntity;
+import com.yahoo.vespa.athenz.client.zts.bindings.AzureTemporaryCredentialsResponseEntity;
 import com.yahoo.vespa.athenz.client.zts.bindings.IdentityRefreshRequestEntity;
 import com.yahoo.vespa.athenz.client.zts.bindings.IdentityResponseEntity;
 import com.yahoo.vespa.athenz.client.zts.bindings.InstanceIdentityCredentials;
@@ -24,6 +26,7 @@
 import com.yahoo.vespa.athenz.client.zts.bindings.RoleCertificateRequestEntity;
 import com.yahoo.vespa.athenz.client.zts.bindings.RoleCertificateResponseEntity;
 import com.yahoo.vespa.athenz.client.zts.bindings.RoleTokenResponseEntity;
+import com.yahoo.vespa.athenz.client.zts.bindings.TemporaryCredentialsResponse;
 import com.yahoo.vespa.athenz.client.zts.bindings.TenantDomainsResponseEntity;
 import com.yahoo.vespa.athenz.client.zts.utils.IdentityCsrGenerator;
 import com.yahoo.vespa.athenz.identity.ServiceIdentityProvider;
@@ -39,6 +42,7 @@
 import java.security.cert.X509Certificate;
 import java.time.Duration;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -228,6 +232,29 @@ public AwsTemporaryCredentials getAwsTemporaryCredentials(AthenzDomain athenzDom
         });
     }
 
+    @Override
+    public AzureTemporaryCredentials getAzureTemporaryCredentials(AthenzRole athenzRole, String azureIdentityId) {
+        return getExternalTemporaryCredentials("azure", athenzRole.domain(),
+                Map.of("athenzRoleName", athenzRole.roleName(), "azureClientId", azureIdentityId),
+                AzureTemporaryCredentialsResponseEntity.class);
+    }
+
+    @Override
+    public AzureTemporaryCredentials getAzureTemporaryCredentials(AthenzRole athenzRole, String azureResourceGroup, String azureIdentityName) {
+        return getExternalTemporaryCredentials("azure", athenzRole.domain(),
+                Map.of("athenzRoleName", athenzRole.roleName(), "azureResourceGroup", azureResourceGroup, "azureClientName", azureIdentityName),
+                AzureTemporaryCredentialsResponseEntity.class);
+    }
+
+    private <T, U extends TemporaryCredentialsResponse<T>> T getExternalTemporaryCredentials(String provider, AthenzDomain domain, Map<String, String> attributes, Class<U> responseClass) {
+        URI uri = ztsUrl.resolve("external/%s/domain/%s/creds".formatted(provider, domain.getName()));
+        RequestBuilder requestBuilder = RequestBuilder.post(uri)
+                .setEntity(toJsonStringEntity(Map.of("clientId", "%s.%s".formatted(domain.getName(), provider), "attributes", attributes)));
+
+        HttpUriRequest request = requestBuilder.build();
+        return execute(request, response -> readEntity(response, responseClass)).credentials();
+    }
+
     @Override
     public boolean hasAccess(AthenzResourceName resource, String action, AthenzIdentity identity) {
         URI uri = ztsUrl.resolve(String.format("access/%s/%s?principal=%s",
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/ZtsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/ZtsClient.java
index 301efc208888..dafde3994994 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/ZtsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/ZtsClient.java
@@ -9,6 +9,7 @@
 import com.yahoo.vespa.athenz.api.AthenzRole;
 import com.yahoo.vespa.athenz.api.AwsRole;
 import com.yahoo.vespa.athenz.api.AwsTemporaryCredentials;
+import com.yahoo.vespa.athenz.api.AzureTemporaryCredentials;
 import com.yahoo.vespa.athenz.api.ZToken;
 
 import java.security.KeyPair;
@@ -167,7 +168,7 @@ default AthenzAccessToken getAccessToken(AthenzDomain domain) {
     List<AthenzDomain> getTenantDomains(AthenzIdentity providerIdentity, AthenzIdentity userIdentity, String roleName);
 
     /**
-     * Get aws temporary credentials
+     * Get AWS temporary credentials
      *
      * @param awsRole AWS role to get credentials for
      * @param externalId External Id to get credentials, or <code>null</code> if not required
@@ -178,7 +179,7 @@ default AwsTemporaryCredentials getAwsTemporaryCredentials(AthenzDomain athenzDo
     }
 
     /**
-     * Get aws temporary credentials
+     * Get AWS temporary credentials
      *
      * @param awsRole AWS role to get credentials for
      * @param duration Duration for which the credentials should be valid, or <code>null</code> to use default
@@ -187,6 +188,21 @@ default AwsTemporaryCredentials getAwsTemporaryCredentials(AthenzDomain athenzDo
      */
     AwsTemporaryCredentials getAwsTemporaryCredentials(AthenzDomain athenzDomain, AwsRole awsRole, Duration duration, String externalId);
 
+    /**
+     * @param athenzRole Athenz role to use when assuming credentials
+     * @param azureIdentityId Client ID of the Azure identity to assume
+     * @return Azure temporary credentials
+     */
+    AzureTemporaryCredentials getAzureTemporaryCredentials(AthenzRole athenzRole, String azureIdentityId);
+
+    /**
+     * @param athenzRole Athenz role to use when assuming credentials
+     * @param azureResourceGroup Azure resource group that contains the target identity
+     * @param azureIdentityName Name of the Azure Identity to assume
+     * @return Azure temporary credentials
+     */
+    AzureTemporaryCredentials getAzureTemporaryCredentials(AthenzRole athenzRole, String azureResourceGroup, String azureIdentityName);
+
     /**
      * Check access to resource for a given principal
      *
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AwsTemporaryCredentialsResponseEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AwsTemporaryCredentialsResponseEntity.java
index d368d5867162..fffe2484d260 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AwsTemporaryCredentialsResponseEntity.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AwsTemporaryCredentialsResponseEntity.java
@@ -11,8 +11,8 @@
  * @author mortent
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class AwsTemporaryCredentialsResponseEntity {
-    private AwsTemporaryCredentials credentials;
+public class AwsTemporaryCredentialsResponseEntity implements TemporaryCredentialsResponse<AwsTemporaryCredentials> {
+    private final AwsTemporaryCredentials credentials;
 
     public AwsTemporaryCredentialsResponseEntity(
             @JsonProperty("accessKeyId") String accessKeyId,
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AzureTemporaryCredentialsResponseEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AzureTemporaryCredentialsResponseEntity.java
new file mode 100644
index 000000000000..fc201bf45c8a
--- /dev/null
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AzureTemporaryCredentialsResponseEntity.java
@@ -0,0 +1,35 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.athenz.client.zts.bindings;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yahoo.vespa.athenz.api.AzureTemporaryCredentials;
+
+import java.time.Instant;
+
+/**
+ * @author freva
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AzureTemporaryCredentialsResponseEntity implements TemporaryCredentialsResponse<AzureTemporaryCredentials> {
+    private final AzureTemporaryCredentials credentials;
+
+    public AzureTemporaryCredentialsResponseEntity(
+            @JsonProperty("attributes") Attributes attributes,
+            @JsonProperty("expiration") Instant expiration) {
+        this.credentials = new AzureTemporaryCredentials(
+                attributes.azureSubscription(),
+                attributes.azureTenant(),
+                attributes.accessToken(),
+                expiration);
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public record Attributes(@JsonProperty("azureSubscription") String azureSubscription,
+                             @JsonProperty("azureTenant") String azureTenant,
+                             @JsonProperty("accessToken") String accessToken) { }
+
+    public AzureTemporaryCredentials credentials() {
+        return credentials;
+    }
+}
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/TemporaryCredentialsResponse.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/TemporaryCredentialsResponse.java
new file mode 100644
index 000000000000..01b3809e6327
--- /dev/null
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/TemporaryCredentialsResponse.java
@@ -0,0 +1,9 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.athenz.client.zts.bindings;
+
+/**
+ * @author freva
+ */
+public interface TemporaryCredentialsResponse<T> {
+    T credentials();
+}
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 8fc614bab45e..b1fa4676a2c2 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -258,6 +258,7 @@ software.amazon.awssdk:retries-spi:${aws-sdk2.vespa.version}
 software.amazon.awssdk:retries:${aws-sdk2.vespa.version}
 software.amazon.awssdk:sdk-core:${aws-sdk2.vespa.version}
 software.amazon.awssdk:secretsmanager:${aws-sdk2.vespa.version}
+software.amazon.awssdk:ssm:${aws-sdk2.vespa.version}
 software.amazon.awssdk:third-party-jackson-core:${aws-sdk2.vespa.version}
 software.amazon.awssdk:utils:${aws-sdk2.vespa.version}
 software.amazon.eventstream:eventstream:1.0.1
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
index 3bf06ecc2c2d..ebc37048198c 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
@@ -1285,35 +1285,55 @@ private interface VisitCallback {
         default void onStart(JsonResponse response, boolean fullyApplied) throws IOException { }
 
         /** Called for every document or removal received from backend visitors—must call the ack for these to proceed. */
-        default void onDocument(JsonResponse response, Document document, DocumentId removeId, Runnable ack, Consumer<String> onError) { }
+        default void onDocument(JsonResponse response, Document document, DocumentId removeId, long persistedTimestamp, Runnable ack, Consumer<String> onError) { }
 
         /** Called at the end of response rendering, before generic status data is written. Called from a dedicated thread pool. */
         default void onEnd(JsonResponse response) throws IOException { }
     }
 
+    @FunctionalInterface
+    private interface VisitProcessingCallback {
+        Result apply(DocumentId id, long persistedTimestamp, DocumentOperationParameters params);
+    }
+
     private void visitAndDelete(HttpRequest request, VisitorParameters parameters, ResponseHandler handler,
                                 TestAndSetCondition condition, String route) {
-        visitAndProcess(request, parameters, true, handler, route, (id, operationParameters) -> {
+        visitAndProcess(request, parameters, true, handler, route, (id, timestamp, operationParameters) -> {
             DocumentRemove remove = new DocumentRemove(id);
-            remove.setCondition(condition);
+            // If the backend provided a persisted timestamp, we set a condition that specifies _both_ the
+            // original selection and the timestamp. If the backend supports timestamp-predicated TaS operations,
+            // it will ignore the selection entirely and only look at the timestamp. If it does not, it will fall
+            // back to evaluating the selection, which preserves legacy behavior.
+            if (timestamp != 0) {
+                remove.setCondition(TestAndSetCondition.ofRequiredTimestampWithSelectionFallback(
+                        timestamp, condition.getSelection()));
+            } else {
+                remove.setCondition(condition);
+            }
             return asyncSession.remove(remove, operationParameters);
         });
     }
 
     private void visitAndUpdate(HttpRequest request, VisitorParameters parameters, boolean fullyApplied,
                                 ResponseHandler handler, DocumentUpdate protoUpdate, String route) {
-        visitAndProcess(request, parameters, fullyApplied, handler, route, (id, operationParameters) -> {
-                DocumentUpdate update = new DocumentUpdate(protoUpdate);
-                update.setId(id);
-                return asyncSession.update(update, operationParameters);
+        visitAndProcess(request, parameters, fullyApplied, handler, route, (id, timestamp, operationParameters) -> {
+            DocumentUpdate update = new DocumentUpdate(protoUpdate);
+            // See `visitAndDelete()` for rationale for sending down a timestamp _and_ the original condition.
+            if (timestamp != 0) {
+                update.setCondition(TestAndSetCondition.ofRequiredTimestampWithSelectionFallback(
+                        timestamp, protoUpdate.getCondition().getSelection()));
+            } // else: use condition already set from protoUpdate
+            update.setId(id);
+            return asyncSession.update(update, operationParameters);
         });
     }
 
     private void visitAndProcess(HttpRequest request, VisitorParameters parameters, boolean fullyApplied,
                                  ResponseHandler handler,
-                                 String route, BiFunction<DocumentId, DocumentOperationParameters, Result> operation) {
+                                 String route, VisitProcessingCallback operation) {
         visit(request, parameters, false, fullyApplied, handler, new VisitCallback() {
-            @Override public void onDocument(JsonResponse response, Document document, DocumentId removeId, Runnable ack, Consumer<String> onError) {
+            @Override public void onDocument(JsonResponse response, Document document, DocumentId removeId,
+                                             long persistedTimestamp, Runnable ack, Consumer<String> onError) {
                 DocumentOperationParameters operationParameters = parameters().withRoute(route)
                         .withResponseHandler(operationResponse -> {
                             outstanding.decrementAndGet();
@@ -1332,7 +1352,7 @@ private void visitAndProcess(HttpRequest request, VisitorParameters parameters,
                             }
                         });
                 visitOperations.offer(() -> {
-                    Result result = operation.apply(document.getId(), operationParameters);
+                    Result result = operation.apply(document.getId(), persistedTimestamp, operationParameters);
                     if (result.type() == Result.ResultType.TRANSIENT_ERROR)
                         return false;
 
@@ -1357,7 +1377,8 @@ private void visitAndWrite(HttpRequest request, VisitorParameters parameters, Re
 
                 response.writeDocumentsArrayStart();
             }
-            @Override public void onDocument(JsonResponse response, Document document, DocumentId removeId, Runnable ack, Consumer<String> onError) {
+            @Override public void onDocument(JsonResponse response, Document document, DocumentId removeId,
+                                             long persistedTimestamp, Runnable ack, Consumer<String> onError) {
                 try {
                     if (streamed) {
                         CompletionHandler completion = new CompletionHandler() {
@@ -1457,13 +1478,21 @@ private void visit(HttpRequest request, VisitorParameters parameters, boolean st
                     @Override public void onMessage(Message m, AckToken token) {
                         Document document = null;
                         DocumentId removeId = null;
-                        if (m instanceof PutDocumentMessage put) document = put.getDocumentPut().getDocument();
-                        else if (parameters.visitRemoves() && m instanceof RemoveDocumentMessage remove) removeId = remove.getDocumentId();
-                        else throw new UnsupportedOperationException("Got unsupported message type: " + m.getClass().getName());
+                        long persistedTimestamp = 0;
+                        if (m instanceof PutDocumentMessage put) {
+                            document = put.getDocumentPut().getDocument();
+                            persistedTimestamp = put.getPersistedTimestamp();
+                        } else if (parameters.visitRemoves() && m instanceof RemoveDocumentMessage remove) {
+                            removeId = remove.getDocumentId();
+                            persistedTimestamp = remove.getPersistedTimestamp();
+                        } else {
+                            throw new UnsupportedOperationException("Got unsupported message type: " + m.getClass().getName());
+                        }
                         locallyReceivedDocCount.getAndAdd(1);
                         callback.onDocument(response,
                                             document,
                                             removeId,
+                                            persistedTimestamp,
                                             () -> ack(token),
                                             errorMessage -> {
                                                 error.set(errorMessage);
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
index 2d3198cc7f46..e3bf9ba76d07 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
@@ -1018,6 +1018,71 @@ public void testResponses() {
         driver.close();
     }
 
+    @Test
+    public void batch_update_rewrites_tas_condition_with_timestamp_predicate_if_provided_by_backend() {
+        var driver = new RequestHandlerTestDriver(handler); // try-with-resources hangs the test on assertion failure, which isn't optimal
+        List<AckToken> tokens = List.of(new AckToken(null), new AckToken(null), new AckToken(null), new AckToken(null));
+        long backendTimestamp = 1234567890;
+
+        access.expect(tokens.subList(2, 3));
+        access.expect(parameters -> {
+            var put = new PutDocumentMessage(new DocumentPut(doc3));
+            put.setPersistedTimestamp(backendTimestamp);
+            parameters.getLocalDataHandler().onMessage(put, tokens.get(2));
+            parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.TIMEOUT, "Won't care");
+        });
+        access.session.expect((update, parameters) -> {
+            // TaS condition should now have _both_ the original selection and the exact backend timestamp.
+            var expectedCondition = TestAndSetCondition.ofRequiredTimestampWithSelectionFallback(backendTimestamp, "optimist");
+            assertEquals(expectedCondition, ((DocumentUpdate) update).getCondition());
+            parameters.responseHandler().get().handleResponse(new UpdateResponse(0, false));
+            return new Result();
+        });
+        var response = driver.sendRequest("http://localhost/document/v1/space/music/docid?selection=optimist&cluster=content&timeChunk=10", PUT,
+                """
+                        {
+                          "fields": {
+                            "artist": { "assign": "Jahn Teigen" }
+                          }
+                        }""");
+        assertSameJson("""
+                        {
+                          "pathId": "/document/v1/space/music/docid",
+                          "documentCount": 1
+                        }""",
+                response.readAll());
+        assertEquals(200, response.getStatus());
+    }
+
+    @Test
+    public void batch_remove_rewrites_tas_condition_with_timestamp_predicate_if_provided_by_backend() {
+        var driver = new RequestHandlerTestDriver(handler); // try-with-resources hangs the test on assertion failure, which isn't optimal
+        List<AckToken> tokens = List.of(new AckToken(null), new AckToken(null), new AckToken(null), new AckToken(null));
+        long backendTimestamp = 1234567890;
+
+        access.expect(tokens.subList(2, 3));
+        access.expect(parameters -> {
+            var put = new PutDocumentMessage(new DocumentPut(doc3.getDataType(), doc3.getId())); // Only the document ID
+            put.setPersistedTimestamp(backendTimestamp);
+            parameters.getLocalDataHandler().onMessage(put, tokens.get(2));
+            parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.TIMEOUT, "Won't care");
+        });
+        access.session.expect((remove, parameters) -> {
+            var expectedCondition = TestAndSetCondition.ofRequiredTimestampWithSelectionFallback(backendTimestamp, "pessimist");
+            assertEquals(expectedCondition, ((DocumentRemove) remove).getCondition());
+            parameters.responseHandler().get().handleResponse(new DocumentIdResponse(0, doc2.getId()));
+            return new Result();
+        });
+        var response = driver.sendRequest("http://localhost/document/v1/?selection=pessimist&cluster=content&timeChunk=10", DELETE);
+        assertSameJson("""
+                        {
+                          "pathId": "/document/v1/",
+                          "documentCount": 1
+                        }""",
+                response.readAll());
+        assertEquals(200, response.getStatus());
+    }
+
     private void doTestVisitRequestWithParams(String httpReqParams, Consumer<VisitorParameters> paramChecker) {
         try (var driver = new RequestHandlerTestDriver(handler)) {
             access.expect(parameters -> {
diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json
index e400a336ad00..b5308884f40d 100644
--- a/vespajlib/abi-spec.json
+++ b/vespajlib/abi-spec.json
@@ -1390,6 +1390,7 @@
       "public abstract java.util.Optional size()",
       "public abstract com.yahoo.tensor.TensorType$Dimension$Type type()",
       "public abstract com.yahoo.tensor.TensorType$Dimension withName(java.lang.String)",
+      "public com.yahoo.tensor.TensorType$Dimension withSize(long)",
       "public boolean isIndexed()",
       "public boolean isMapped()",
       "public abstract java.lang.String toString()",
@@ -1531,7 +1532,8 @@
     ],
     "methods" : [
       "public void <init>()",
-      "public static varargs com.yahoo.tensor.Tensor toSparse(com.yahoo.tensor.Tensor, java.lang.String[])"
+      "public static varargs com.yahoo.tensor.Tensor toSparse(com.yahoo.tensor.Tensor, java.lang.String[])",
+      "public static com.yahoo.tensor.Tensor packBits(com.yahoo.tensor.Tensor)"
     ],
     "fields" : [ ]
   },
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
index fc0473c635a4..5b800aa58eeb 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
@@ -97,6 +97,7 @@ public double get(DirectIndexedAddress address) {
         return get(address.getDirectIndex());
     }
     public DirectIndexedAddress directAddress() { return DirectIndexedAddress.of(dimensionSizes); }
+
     /**
      * Returns the value at the given indexes as a float
      *
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java
index 65c6677e7e36..386f24bfe623 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java
@@ -344,7 +344,7 @@ public Tensor.Builder block(TensorAddress sparsePart, double[] values) {
 
         @Override
         public MixedTensor build() {
-            //TODO This can be solved more efficiently with a single map.
+            // TODO: This can be solved more efficiently with a single map.
             Set<Map.Entry<TensorAddress, double[]>> entrySet = denseSubspaceMap.entrySet();
             for (Map.Entry<TensorAddress, double[]> entry : entrySet) {
                 TensorAddress sparsePart = entry.getKey();
@@ -356,7 +356,7 @@ public MixedTensor build() {
         }
 
         public static BoundBuilder of(TensorType type) {
-            //TODO Wire in expected map size to avoid expensive resize
+            // TODO: Wire in expected map size to avoid expensive resize
             return new BoundBuilder(type, INITIAL_HASH_CAPACITY);
         }
     }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
index d225d6f46412..15c20e1a883f 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
@@ -96,7 +96,7 @@ default int sizeAsInt() {
 
     /**
      * Returns the cell of this in some undefined order.
-     * A cell instances is only valid until next() is called.
+     * A cell instance is only valid until next() is called.
      * Call detach() on the cell to obtain a long-lived instance.
      */
     Iterator<Cell> cellIterator();
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
index 0421f6a6a9da..c96a8decd161 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
@@ -111,15 +111,15 @@ public TensorAddress partialCopy(int[] indexMap) {
         return TensorAddressAny.ofUnsafe(labels);
     }
 
-    /** Creates a complete address by taking the mapped dimmensions from this and the indexed from the indexedPart */
-    public TensorAddress fullAddressOf(List<TensorType.Dimension> dimensions, int[] densePart) {
+    /** Creates a complete address by taking the mapped dimensions of this and adding the indexed from the indexedPart */
+    public TensorAddress fullAddressOf(List<TensorType.Dimension> dimensions, int[] indexedPart) {
         long[] labels = new long[dimensions.size()];
         int mappedIndex = 0;
         int indexedIndex = 0;
         for (int i = 0; i < labels.length; i++) {
             TensorType.Dimension d = dimensions.get(i);
             if (d.isIndexed()) {
-                labels[i] = densePart[indexedIndex];
+                labels[i] = indexedPart[indexedIndex];
                 indexedIndex++;
             } else {
                 labels[i] = numericLabel(mappedIndex);
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorParser.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorParser.java
index c93d2dac13e6..5f30578beeeb 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorParser.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorParser.java
@@ -5,7 +5,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
+import com.yahoo.tensor.serialization.JsonFormat;
 import static com.yahoo.tensor.serialization.JsonFormat.decodeHexString;
 
 /**
@@ -17,6 +19,14 @@ static Tensor tensorFrom(String tensorString, Optional<TensorType> explicitType)
         try {
             return tensorFromBody(tensorString, explicitType);
         } catch (IllegalArgumentException e) {
+            if (explicitType.isPresent()) {
+                // handle legal JSON-based tensor formats as well:
+                try {
+                    return JsonFormat.decode(explicitType.get(), tensorString.getBytes(UTF_8));
+                } catch (RuntimeException ignored) {
+                    // return error from exception above
+                }
+            }
             throw new IllegalArgumentException("Could not parse '" + tensorString + "' as a tensor" +
                                                (explicitType.isPresent() ? " of type " + explicitType.get() : ""),
                                                e);
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
index a90dab6d185e..37b8d8d60018 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
@@ -373,6 +373,11 @@ private Dimension(String name) {
         /** Returns a copy of this with the name set to the given name */
         public abstract Dimension withName(String name);
 
+        /** Returns a copy of this with the size set to the given value */
+        public Dimension withSize(long size) {
+            return IndexedBoundDimension.indexed(name, size);
+        }
+
         /** Returns true if this is an indexed bound or unbound type */
         public boolean isIndexed() { return type() == Type.indexedBound || type() == Type.indexedUnbound; }
 
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/Tensors.java b/vespajlib/src/main/java/com/yahoo/tensor/Tensors.java
index 92cba5b9bd37..34743e4d0655 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/Tensors.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/Tensors.java
@@ -46,4 +46,60 @@ public static Tensor toSparse(Tensor tensor, String ... dimensions) {
         return builder.build();
     }
 
+    /**
+     * Converts any tensor containing only ones and zeroes into one where each consecutive 8 values in the
+     * dense dimension are packed into a single byte. As a consequence the output type of this is a tensor
+     * where the dense dimension is 1/8th as large.
+     *
+     * @throws IllegalArgumentException if the tensor has the wrong type or contains any other value than 0 or 1
+     */
+    public static Tensor packBits(Tensor tensor) {
+        if (tensor.type().indexedSubtype().dimensions().size() != 1)
+            throw new IllegalArgumentException("packBits requires a tensor with one dense dimensions, but got " + tensor.type());
+
+        // Create the packed type
+        var typeBuilder = new TensorType.Builder(TensorType.Value.INT8);
+        for (var d : tensor.type().dimensions())
+            typeBuilder.dimension(d.size().isPresent() ? d.withSize((int) Math.ceil(d.size().get() / 8.0)) : d);
+        var packedType = typeBuilder.build();
+
+        // Pack it
+        Tensor.Builder builder = Tensor.Builder.of(packedType);
+        if (tensor instanceof IndexedTensor indexed) {
+            for (long i = 0; i < indexed.size(); ) {
+                long packedIndex = i / 8;
+                int packedValue = 0;
+                for (int j = 0; j < 8 && i < indexed.size(); j++)
+                    packedValue = packInto(packedValue, indexed.get(i), j, i++);
+                builder.cell(packedValue, packedIndex);
+            }
+        }
+        else if (tensor instanceof MixedTensor mixed) {
+            for (var denseSubspace : mixed.getInternalDenseSubspaces()) {
+                for (int i = 0; i < denseSubspace.cells.length; ) {
+                    var packedAddress = denseSubspace.sparseAddress.fullAddressOf(mixed.type().dimensions(), new int[]{i / 8});
+                    int packedValue = 0;
+                    for (int j = 0; j < 8 && i < denseSubspace.cells.length; j++)
+                        packedValue = packInto(packedValue, denseSubspace.cells[i], j, i++);
+                    builder.cell(packedAddress, packedValue);
+                }
+            }
+        }
+        else {
+            throw new IllegalArgumentException("The argument is neither of type IndexedTensor or MixedTensor, but " +
+                                               tensor.getClass());
+        }
+        return builder.build();
+    }
+
+    private static int packInto(int packedValue, double value, int bitPosition, long sourcePosition) {
+        if (value == 0.0)
+            return packedValue;
+        else if (value == 1.0)
+            return packedValue | ( 1 << ( 7 - bitPosition ));
+        else
+            throw new IllegalArgumentException("The tensor to be packed can only contain 0 or 1 values, " +
+                                               "but has " + value + " at position " + sourcePosition);
+    }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
index 5598690e0bf0..280f6541f025 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
@@ -294,7 +294,7 @@ private static boolean isArrayOfObjects(Inspector inspector) {
     }
 
     private static void decodeSingleDimensionBlock(String key, Inspector value, MixedTensor.BoundBuilder mixedBuilder) {
-        if (value.type() != Type.ARRAY)
+        if (value.type() != Type.ARRAY && value.type() != Type.STRING)
             throw new IllegalArgumentException("Expected an item in a blocks array to be an array, not " + value.type());
         mixedBuilder.block(asAddress(key, mixedBuilder.type().mappedSubtype()),
                            decodeValuesInBlock(value, mixedBuilder));
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorParserTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorParserTestCase.java
index 10dca848d654..b31ec8cd7388 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/TensorParserTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorParserTestCase.java
@@ -400,4 +400,18 @@ private void assertIllegal(String message, String tensor) {
         }
     }
 
+    @Test
+    public void testJsonFormatInside() {
+        var type = TensorType.fromSpec("tensor<int8>(key{}, x[2])");
+        var expected = Tensor.Builder.of(type)
+                .cell(TensorAddress.ofLabels("a", "0"), (byte)0xa1)
+                .cell(TensorAddress.ofLabels("a", "1"), 2)
+                .cell(TensorAddress.ofLabels("b", "0"), (byte)0xA3)
+                .cell(TensorAddress.ofLabels("b", "1"), 4)
+                .build();
+        assertEquals(expected, Tensor.from(type, "{'a': 'a102', 'b': 'A304'}"));
+        assertEquals(expected, Tensor.from(type, "{'blocks': {'a': 'a102', 'b': 'A304'}}"));
+        assertEquals(expected, Tensor.from(type, "{'blocks': [{'address': {'key': 'a'}, 'values': 'a102'}, {'address':{'key': 'b'}, 'values': 'A304'}]}"));
+    }
+
 }
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorsTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorsTestCase.java
index 84d337deeb70..6d146ca9c9fa 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/TensorsTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorsTestCase.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author bratseth
@@ -24,9 +25,43 @@ void testToSparse() {
         }
     }
 
+    @Test
+    void testPackBits() {
+        assertPacked("tensor<int8>(x[2]):[129,14]", "tensor(x[16]):[1,0,0,0,0,0,0,1, 0,0,0,0,1,1,1,0]");
+        assertPacked("tensor<int8>(x[2]):[129,14]", "tensor(x[15]):[1,0,0,0,0,0,0,1, 0,0,0,0,1,1,1]");
+        assertPacked("tensor<int8>(x[1]):[128]",    "tensor(x[1]):[1]");
+        assertPacked("tensor<int8>(key{},x[2]):{a:[129,14], b:[12, 7]}",
+                         "tensor(key{},x[16]):{a:[1,0,0,0,0,0,0,1, 0,0,0,0,1,1,1,0]," +
+                               "                     b:[0,0,0,0,1,1,0,0, 0,0,0,0,0,1,1,1]}");
+        assertPacked("tensor<int8>(key{},x[1]):{a:[160],b:[32]}",
+                     "tensor(key{},x[3]):{a:[1,0,1],b:[0,0,1]}");
+        assertPacked("tensor<int8>(key{},x[1]):{a:[128]}",    "tensor(key{}, x[1]):{a:[1]}");
+
+        try {
+            Tensors.packBits(Tensor.from("tensor(x[1],y[1]):[1]"));
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("packBits requires a tensor with one dense dimensions, but got tensor(x[1],y[1])",
+                         e.getMessage());
+        }
+        try {
+            Tensors.packBits(Tensor.from("tensor(x[3]):[0, 1, 2]"));
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("The tensor to be packed can only contain 0 or 1 values, but has 2.0 at position 2",
+                         e.getMessage());
+        }
+    }
+
     void assertConvertedToSparse(String inputType, String outputType, String tensorValue, String ... dimensions) {
         var tensor = Tensor.from(inputType + ":" + tensorValue);
         assertEquals(outputType + ":" + tensorValue, Tensors.toSparse(tensor, dimensions).toString(true, false));
     }
 
+    void assertPacked(String expected, String input) {
+        assertEquals(Tensor.from(expected), Tensors.packBits(Tensor.from(input)));
+    }
+
 }
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java
index 52f44f0ac42a..ee045807b55a 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java
@@ -464,20 +464,23 @@ public void testInt8VectorInvalidHex() {
     @Test
     public void testMixedInt8TensorWithHexForm() {
         Tensor.Builder builder = Tensor.Builder.of(TensorType.fromSpec("tensor<int8>(x{},y[3])"));
-        builder.cell().label("x", 0).label("y", 0).value(2.0);
-        builder.cell().label("x", 0).label("y", 1).value(3.0);
-        builder.cell().label("x", 0).label("y", 2).value(4.0);
-        builder.cell().label("x", 1).label("y", 0).value(5.0);
-        builder.cell().label("x", 1).label("y", 1).value(6.0);
-        builder.cell().label("x", 1).label("y", 2).value(7.0);
+        builder.cell().label("x", "a").label("y", 0).value(2.0);
+        builder.cell().label("x", "a").label("y", 1).value(3.0);
+        builder.cell().label("x", "a").label("y", 2).value(4.0);
+        builder.cell().label("x", "b").label("y", 0).value(5.0);
+        builder.cell().label("x", "b").label("y", 1).value(6.0);
+        builder.cell().label("x", "b").label("y", 2).value(7.0);
         Tensor expected = builder.build();
 
         String mixedJson = "{\"blocks\":[" +
-                           "{\"address\":{\"x\":\"0\"},\"values\":\"020304\"}," +
-                           "{\"address\":{\"x\":\"1\"},\"values\":\"050607\"}" +
+                           "{\"address\":{\"x\":\"a\"},\"values\":\"020304\"}," +
+                           "{\"address\":{\"x\":\"b\"},\"values\":\"050607\"}" +
                            "]}";
         Tensor decoded = JsonFormat.decode(expected.type(), mixedJson.getBytes(StandardCharsets.UTF_8));
         assertEquals(expected, decoded);
+        String shortJson = "{\"a\": \"020304\", \"b\": \"050607\"}";
+        decoded = JsonFormat.decode(expected.type(), shortJson.getBytes(StandardCharsets.UTF_8));
+        assertEquals(expected, decoded);
     }
 
     @Test
diff --git a/vespalib/src/tests/stllike/string_test.cpp b/vespalib/src/tests/stllike/string_test.cpp
index a29e979d04f8..9101b15ed655 100644
--- a/vespalib/src/tests/stllike/string_test.cpp
+++ b/vespalib/src/tests/stllike/string_test.cpp
@@ -360,15 +360,14 @@ TEST("require that you can format a number into a std::string easily") {
     EXPECT_EQUAL(vespalib::stringify(18446744073709551615uLL), "18446744073709551615");
 }
 
-using vespalib::contains;
 TEST("require that contains works") {
     std::string s("require that contains works");
-    EXPECT_TRUE(contains(s, "require"));
-    EXPECT_TRUE(contains(s, "require that contains work"));
-    EXPECT_TRUE(contains(s, "require that contains works"));
-    EXPECT_TRUE(contains(s, "equire"));
-    EXPECT_TRUE(contains(s, "ks"));
-    EXPECT_FALSE(contains(s, "not in there"));
+    EXPECT_TRUE(s.contains("require"));
+    EXPECT_TRUE(s.contains("require that contains work"));
+    EXPECT_TRUE(s.contains("require that contains works"));
+    EXPECT_TRUE(s.contains("equire"));
+    EXPECT_TRUE(s.contains("ks"));
+    EXPECT_FALSE(s.contains("not in there"));
 }
 
 TEST("require that starts_with works") {
diff --git a/vespalib/src/vespa/vespalib/gtest/gtest.h b/vespalib/src/vespa/vespalib/gtest/gtest.h
index d0285110b458..9ffad1bd9812 100644
--- a/vespalib/src/vespa/vespalib/gtest/gtest.h
+++ b/vespalib/src/vespa/vespalib/gtest/gtest.h
@@ -20,7 +20,7 @@ main(int argc, char* argv[])                \
         TRY_BLOCK;                                                        \
         FAIL() << "exception '" << MESSAGE << "' not thrown at all!";     \
     } catch(EXCEPTION_TYPE& e) {                                          \
-        EXPECT_TRUE(std::string_view(e.what()).find(std::string_view(MESSAGE)) != std::string_view::npos) << \
+        EXPECT_TRUE(std::string_view(e.what()).contains(std::string_view(MESSAGE))) << \
             " e.what(): " << e.what() << "\n";                            \
     } catch(...) {                                                        \
         FAIL() << "wrong exception type thrown";                          \
diff --git a/vespalib/src/vespa/vespalib/stllike/string.h b/vespalib/src/vespa/vespalib/stllike/string.h
index 240ef8e08bcf..ba6431dbd551 100644
--- a/vespalib/src/vespa/vespalib/stllike/string.h
+++ b/vespalib/src/vespa/vespalib/stllike/string.h
@@ -9,10 +9,6 @@
 
 namespace vespalib {
 
-inline bool contains(std::string_view text, std::string_view key) noexcept {
-    return text.find(key) != std::string_view::npos;
-}
-
 // returns a reference to a shared empty string
 const std::string &empty_string() noexcept;
 
diff --git a/vespalib/src/vespa/vespalib/util/memoryusage.cpp b/vespalib/src/vespa/vespalib/util/memoryusage.cpp
index 185227723605..2b0d5714e3ab 100644
--- a/vespalib/src/vespa/vespalib/util/memoryusage.cpp
+++ b/vespalib/src/vespa/vespalib/util/memoryusage.cpp
@@ -2,6 +2,7 @@
 
 #include "memoryusage.h"
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <ostream>
 
 namespace vespalib {
 
@@ -14,10 +15,15 @@ MemoryUsage::toString() const {
 
 asciistream &
 operator << (asciistream & os, const MemoryUsage & usage) {
-    os << "allocated: " << usage.allocatedBytes();
+    os << "{allocated: " << usage.allocatedBytes();
     os << ", used: " << usage.usedBytes();
     os << ", dead: " << usage.deadBytes();
-    os << ", onhold: " << usage.allocatedBytesOnHold();
+    os << ", onhold: " << usage.allocatedBytesOnHold() << "}";
+    return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const MemoryUsage& usage) {
+    os << usage.toString();
     return os;
 }
 
diff --git a/vespalib/src/vespa/vespalib/util/memoryusage.h b/vespalib/src/vespa/vespalib/util/memoryusage.h
index 34ca05bf418a..11c700c11a9d 100644
--- a/vespalib/src/vespa/vespalib/util/memoryusage.h
+++ b/vespalib/src/vespa/vespalib/util/memoryusage.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <string>
+#include <iosfwd>
 
 namespace vespalib {
 
@@ -50,17 +51,25 @@ class MemoryUsage {
         _allocatedBytesOnHold += inc;
     }
 
-    void merge(const MemoryUsage & rhs) {
+    void merge(const MemoryUsage & rhs) noexcept {
         _allocatedBytes += rhs._allocatedBytes;
         _usedBytes += rhs._usedBytes;
         _deadBytes += rhs._deadBytes;
         _allocatedBytesOnHold += rhs._allocatedBytesOnHold;
     }
+
+    bool operator==(const MemoryUsage& rhs) const noexcept {
+        return _allocatedBytes == rhs._allocatedBytes &&
+        _usedBytes == rhs._usedBytes &&
+        _deadBytes == rhs._deadBytes &&
+        _allocatedBytesOnHold == rhs._allocatedBytesOnHold;
+    }
     std::string toString() const;
 };
 
 class asciistream;
 
 asciistream & operator << (asciistream & os, const MemoryUsage & usage);
+std::ostream& operator<<(std::ostream& os, const MemoryUsage& usage);
 
 } // namespace vespalib