diff --git a/packages/ebsi-support/package.json b/packages/ebsi-support/package.json
index 5be0fe36c..87e698bb0 100644
--- a/packages/ebsi-support/package.json
+++ b/packages/ebsi-support/package.json
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@ethersproject/random": "^5.7.0",
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/did-auth-siop": "0.16.1-next.339",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-next.339",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
     "@sphereon/ssi-sdk-ext.did-resolver-ebsi": "0.27.0",
@@ -44,8 +44,8 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/oid4vci-client": "0.16.1-next.339",
+    "@sphereon/oid4vci-common": "0.16.1-next.339",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.key-manager": "0.27.0",
     "@sphereon/ssi-sdk-ext.kms-local": "0.27.0",
diff --git a/packages/mdl-mdoc/package.json b/packages/mdl-mdoc/package.json
index f3479d6ac..e079c408e 100644
--- a/packages/mdl-mdoc/package.json
+++ b/packages/mdl-mdoc/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/did-auth-siop": "0.16.1-next.339",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
@@ -35,8 +35,8 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/oid4vci-client": "0.16.1-next.339",
+    "@sphereon/oid4vci-common": "0.16.1-next.339",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.key-manager": "0.27.0",
     "@sphereon/ssi-sdk-ext.kms-local": "0.27.0",
diff --git a/packages/oid4vci-holder/package.json b/packages/oid4vci-holder/package.json
index e81cb6eae..3ec00c889 100644
--- a/packages/oid4vci-holder/package.json
+++ b/packages/oid4vci-holder/package.json
@@ -15,9 +15,9 @@
   },
   "dependencies": {
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/oid4vci-client": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/did-auth-siop": "0.16.1-next.339",
+    "@sphereon/oid4vci-client": "0.16.1-next.339",
+    "@sphereon/oid4vci-common": "0.16.1-next.339",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk-ext.jwt-service": "0.27.0",
@@ -45,7 +45,7 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vc-common": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/oid4vc-common": "0.16.1-next.339",
     "@sphereon/ssi-sdk.siopv2-oid4vp-common": "workspace:*",
     "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.27.0",
     "@types/i18n-js": "^3.8.9",
diff --git a/packages/oid4vci-issuer-rest-api/package.json b/packages/oid4vci-issuer-rest-api/package.json
index b73ad7e3e..b3cbf2575 100644
--- a/packages/oid4vci-issuer-rest-api/package.json
+++ b/packages/oid4vci-issuer-rest-api/package.json
@@ -11,9 +11,9 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/oid4vci-issuer": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/oid4vci-issuer-server": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/oid4vci-common": "0.16.1-next.339",
+    "@sphereon/oid4vci-issuer": "0.16.1-next.339",
+    "@sphereon/oid4vci-issuer-server": "0.16.1-next.339",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk.kv-store-temp": "workspace:*",
diff --git a/packages/oid4vci-issuer-rest-client/package.json b/packages/oid4vci-issuer-rest-client/package.json
index ea3f4bb2a..413e719aa 100644
--- a/packages/oid4vci-issuer-rest-client/package.json
+++ b/packages/oid4vci-issuer-rest-client/package.json
@@ -16,7 +16,7 @@
     "generate-plugin-schema": "ts-node ../../packages/dev/bin/sphereon.js dev generate-plugin-schema"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/oid4vci-common": "0.16.1-next.339",
     "@sphereon/ssi-types": "workspace:*",
     "@veramo/core": "4.2.0",
     "cross-fetch": "^3.1.8"
diff --git a/packages/oid4vci-issuer-store/package.json b/packages/oid4vci-issuer-store/package.json
index 1bff5aeb9..ed597c783 100644
--- a/packages/oid4vci-issuer-store/package.json
+++ b/packages/oid4vci-issuer-store/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/oid4vci-common": "0.16.1-next.339",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk.kv-store-temp": "workspace:*",
diff --git a/packages/oid4vci-issuer/package.json b/packages/oid4vci-issuer/package.json
index 512aa0922..41e9ce3de 100644
--- a/packages/oid4vci-issuer/package.json
+++ b/packages/oid4vci-issuer/package.json
@@ -14,8 +14,8 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/oid4vci-issuer": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/oid4vci-common": "0.16.1-next.339",
+    "@sphereon/oid4vci-issuer": "0.16.1-next.339",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",
@@ -35,7 +35,7 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/did-auth-siop": "0.16.1-next.339",
     "@sphereon/did-uni-client": "^0.6.3",
     "@veramo/did-provider-key": "4.2.0",
     "@veramo/did-resolver": "4.2.0",
diff --git a/packages/siopv2-oid4vp-common/package.json b/packages/siopv2-oid4vp-common/package.json
index e10ecd273..e084da24e 100644
--- a/packages/siopv2-oid4vp-common/package.json
+++ b/packages/siopv2-oid4vp-common/package.json
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/did-auth-siop": "0.16.1-next.339",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-types": "workspace:*",
     "uint8arrays": "3.1.1"
diff --git a/packages/siopv2-oid4vp-op-auth/package.json b/packages/siopv2-oid4vp-op-auth/package.json
index efd355a2c..eb08fb0d5 100644
--- a/packages/siopv2-oid4vp-op-auth/package.json
+++ b/packages/siopv2-oid4vp-op-auth/package.json
@@ -14,9 +14,9 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/oid4vc-common": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/did-auth-siop": "0.16.1-next.339",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-next.339",
+    "@sphereon/oid4vc-common": "0.16.1-next.339",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
diff --git a/packages/siopv2-oid4vp-op-auth/src/session/OpSession.ts b/packages/siopv2-oid4vp-op-auth/src/session/OpSession.ts
index d03e8a9b5..2a20b752c 100644
--- a/packages/siopv2-oid4vp-op-auth/src/session/OpSession.ts
+++ b/packages/siopv2-oid4vp-op-auth/src/session/OpSession.ts
@@ -240,7 +240,7 @@ export class OpSession {
   private createPresentationVerificationCallback(context: IRequiredContext) {
     async function presentationVerificationCallback(
       args: W3CVerifiablePresentation | CompactSdJwtVc,
-      presentationSubmission: PresentationSubmission,
+      presentationSubmission?: PresentationSubmission,
     ): Promise<PresentationVerificationResult> {
       let result: IVerifyResult
       if (CredentialMapper.isSdJwtEncoded(args)) {
diff --git a/packages/siopv2-oid4vp-rp-auth/package.json b/packages/siopv2-oid4vp-rp-auth/package.json
index 6c39c0b1f..51bf9bdef 100644
--- a/packages/siopv2-oid4vp-rp-auth/package.json
+++ b/packages/siopv2-oid4vp-rp-auth/package.json
@@ -14,9 +14,9 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SPRIND.89.257",
-    "@sphereon/oid4vc-common": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/did-auth-siop": "0.16.1-next.339",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-next.339",
+    "@sphereon/oid4vc-common": "0.16.1-next.339",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
diff --git a/packages/siopv2-oid4vp-rp-auth/src/functions.ts b/packages/siopv2-oid4vp-rp-auth/src/functions.ts
index 23f19fcf4..61091fed6 100644
--- a/packages/siopv2-oid4vp-rp-auth/src/functions.ts
+++ b/packages/siopv2-oid4vp-rp-auth/src/functions.ts
@@ -64,7 +64,7 @@ export function getPresentationVerificationCallback(
 ): PresentationVerificationCallback {
   async function presentationVerificationCallback(
     args: any, // FIXME any
-    presentationSubmission: PresentationSubmission,
+    presentationSubmission?: PresentationSubmission,
   ): Promise<PresentationVerificationResult> {
     if (CredentialMapper.isSdJwtEncoded(args)) {
       const result: IVerifySdJwtPresentationResult = await context.agent.verifySdJwtPresentation({
@@ -80,6 +80,9 @@ export function getPresentationVerificationCallback(
       if (context.agent.mdocOid4vpRPVerify === undefined) {
         return Promise.reject('ImDLMdoc agent plugin must be enabled to support MsoMdoc types')
       }
+      if (!presentationSubmission) {
+        return Promise.reject('No presentationSubmission present')
+      }
       const verifyResult = await context.agent.mdocOid4vpRPVerify({
         vp_token: args,
         presentation_submission: presentationSubmission,
diff --git a/packages/siopv2-oid4vp-rp-rest-api/package.json b/packages/siopv2-oid4vp-rp-rest-api/package.json
index fb900029c..424f3f785 100644
--- a/packages/siopv2-oid4vp-rp-rest-api/package.json
+++ b/packages/siopv2-oid4vp-rp-rest-api/package.json
@@ -11,7 +11,7 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/did-auth-siop": "0.16.1-next.339",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-sdk.credential-validation": "workspace:*",
diff --git a/packages/w3c-vc-api/package.json b/packages/w3c-vc-api/package.json
index e1b48bad4..8dc47b5c9 100644
--- a/packages/w3c-vc-api/package.json
+++ b/packages/w3c-vc-api/package.json
@@ -11,7 +11,7 @@
     "start:dev": "ts-node __tests__/agent.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SPRIND.89.257",
+    "@sphereon/did-auth-siop": "0.16.1-next.339",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1b0ec82cf..6a77e27d2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -615,11 +615,11 @@ importers:
         specifier: ^5.7.0
         version: 5.7.0
       '@sphereon/did-auth-siop':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/did-auth-siop-adapter':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/pex':
         specifier: 5.0.0-unstable.28
         version: 5.0.0-unstable.28
@@ -697,11 +697,11 @@ importers:
         version: 4.38.3
     devDependencies:
       '@sphereon/oid4vci-client':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/oid4vci-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/ssi-express-support':
         specifier: workspace:*
         version: link:../ssi-express-support
@@ -914,8 +914,8 @@ importers:
   packages/mdl-mdoc:
     dependencies:
       '@sphereon/did-auth-siop':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/kmp-mdoc-core':
         specifier: 0.2.0-SNAPSHOT.26
         version: 0.2.0-SNAPSHOT.26
@@ -972,11 +972,11 @@ importers:
         version: 9.0.1
     devDependencies:
       '@sphereon/oid4vci-client':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/oid4vci-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/ssi-express-support':
         specifier: workspace:*
         version: link:../ssi-express-support
@@ -1145,17 +1145,17 @@ importers:
   packages/oid4vci-holder:
     dependencies:
       '@sphereon/did-auth-siop':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/kmp-mdoc-core':
         specifier: 0.2.0-SNAPSHOT.26
         version: 0.2.0-SNAPSHOT.26
       '@sphereon/oid4vci-client':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/oid4vci-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/ssi-sdk-ext.did-utils':
         specifier: 0.27.0
         version: 0.27.0(encoding@0.1.13)(pg@8.13.1)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@20.17.9)(typescript@5.6.3))
@@ -1233,8 +1233,8 @@ importers:
         version: 4.38.3
     devDependencies:
       '@sphereon/oid4vc-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339
       '@sphereon/ssi-sdk-ext.did-resolver-jwk':
         specifier: 0.27.0
         version: 0.27.0
@@ -1269,11 +1269,11 @@ importers:
   packages/oid4vci-issuer:
     dependencies:
       '@sphereon/oid4vci-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/oid4vci-issuer':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)
       '@sphereon/ssi-sdk-ext.did-utils':
         specifier: 0.27.0
         version: 0.27.0(encoding@0.1.13)(pg@8.13.1)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@20.17.9)(typescript@5.6.3))
@@ -1327,8 +1327,8 @@ importers:
         version: 9.0.1
     devDependencies:
       '@sphereon/did-auth-siop':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/did-uni-client':
         specifier: ^0.6.3
         version: 0.6.3(encoding@0.1.13)
@@ -1351,14 +1351,14 @@ importers:
   packages/oid4vci-issuer-rest-api:
     dependencies:
       '@sphereon/oid4vci-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/oid4vci-issuer':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)
       '@sphereon/oid4vci-issuer-server':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(@noble/hashes@1.6.1)(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)(passport-azure-ad@4.3.5)(passport-http-bearer@1.0.1)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(@noble/hashes@1.6.1)(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)(passport-azure-ad@4.3.5)(passport-http-bearer@1.0.1)
       '@sphereon/ssi-express-support':
         specifier: workspace:*
         version: link:../ssi-express-support
@@ -1517,8 +1517,8 @@ importers:
   packages/oid4vci-issuer-rest-client:
     dependencies:
       '@sphereon/oid4vci-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/ssi-types':
         specifier: workspace:*
         version: link:../ssi-types
@@ -1554,8 +1554,8 @@ importers:
   packages/oid4vci-issuer-store:
     dependencies:
       '@sphereon/oid4vci-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/ssi-sdk-ext.did-utils':
         specifier: 0.27.0
         version: 0.27.0(encoding@0.1.13)(pg@8.13.1)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@20.17.9)(typescript@5.6.3))
@@ -2252,8 +2252,8 @@ importers:
   packages/siopv2-oid4vp-common:
     dependencies:
       '@sphereon/did-auth-siop':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/ssi-sdk.core':
         specifier: workspace:*
         version: link:../ssi-sdk-core
@@ -2274,14 +2274,14 @@ importers:
   packages/siopv2-oid4vp-op-auth:
     dependencies:
       '@sphereon/did-auth-siop':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/did-auth-siop-adapter':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/oid4vc-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339
       '@sphereon/pex':
         specifier: 5.0.0-unstable.28
         version: 5.0.0-unstable.28
@@ -2407,14 +2407,14 @@ importers:
   packages/siopv2-oid4vp-rp-auth:
     dependencies:
       '@sphereon/did-auth-siop':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/did-auth-siop-adapter':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/oid4vc-common':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339
       '@sphereon/pex':
         specifier: 5.0.0-unstable.28
         version: 5.0.0-unstable.28
@@ -2495,8 +2495,8 @@ importers:
   packages/siopv2-oid4vp-rp-rest-api:
     dependencies:
       '@sphereon/did-auth-siop':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/ssi-express-support':
         specifier: workspace:*
         version: link:../ssi-express-support
@@ -3604,8 +3604,8 @@ importers:
   packages/w3c-vc-api:
     dependencies:
       '@sphereon/did-auth-siop':
-        specifier: 0.16.1-feature.SPRIND.89.257
-        version: 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+        specifier: 0.16.1-next.339
+        version: 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/ssi-express-support':
         specifier: workspace:*
         version: link:../ssi-express-support
@@ -6013,12 +6013,12 @@ packages:
   '@sinonjs/fake-timers@8.1.0':
     resolution: {integrity: sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==}
 
-  '@sphereon/did-auth-siop-adapter@0.16.1-feature.SPRIND.89.257':
-    resolution: {integrity: sha512-9TC9G2Zf81LdacLwNqPGY7oMMi2uPsR8PcfhQpGj/PdBYDL0klSdkSGQFLypkPZU4ztUY8FQsSi6c+51bIRJug==}
+  '@sphereon/did-auth-siop-adapter@0.16.1-next.339':
+    resolution: {integrity: sha512-HeBxuv4Q8b2p6act0TL/80F2tef5OpnBxcliakzdt/GsmPwBzwczW1ViFQiCdO76JMvmjza50RSzU6f0jFVY8Q==}
     engines: {node: '>=18'}
 
-  '@sphereon/did-auth-siop@0.16.1-feature.SPRIND.89.257':
-    resolution: {integrity: sha512-hL3o7ZVGMDY+KFkKsr184Xktw+H40CCAW5EK31zXWiVQqavJTeDkG+gBqT2ci1phZxnmYYok9yk8pYl5A541Xw==}
+  '@sphereon/did-auth-siop@0.16.1-next.339':
+    resolution: {integrity: sha512-1gfsJBjzwVQcjceXEjTgxU3OZPX0C9cikR3tlogOz4pD4Yy9TL4bz+tIEk0FJup2U09LfQw/MdTNFWjfbAvYJQ==}
     engines: {node: '>=18'}
 
   '@sphereon/did-provider-oyd@0.27.0':
@@ -6041,8 +6041,8 @@ packages:
       '@sphereon/react-native-argon2': ^2.0.9
       react-native: '>=0.60.0'
 
-  '@sphereon/jarm@0.16.1-feature.SPRIND.89.257':
-    resolution: {integrity: sha512-0r3ZFvEDRHau2oO6E94i0Fo3qLQlbwlSP0JtDKTFl6190RJBN/g/GYCFEUj4AH9hjlfgc6lvF0YY2Y0uYng3Ag==}
+  '@sphereon/jarm@0.16.1-next.339':
+    resolution: {integrity: sha512-PQABG/rZpK1ypZqfHRV3HuxVDxclRJnD41A8fnr8EQB5JFKElSQ/SWEIWi7DD1HeWqzZnRiLWt1boPuWjgphOQ==}
     engines: {node: '>=18'}
 
   '@sphereon/kmp-mdoc-core@0.2.0-SNAPSHOT.26':
@@ -6052,20 +6052,20 @@ packages:
   '@sphereon/lto-did-ts@0.1.8-unstable.0':
     resolution: {integrity: sha512-3jzwwuYX/VYuze+T9/yg4PcsJ5iNNwAfTp4WfS4aSfPFBErDAfKXqn6kOb0wFYGkhejr3Jz+rljPC2iKZiHiGA==}
 
-  '@sphereon/oid4vc-common@0.16.1-feature.SPRIND.89.257':
-    resolution: {integrity: sha512-zkbcTwMnf1CgNlfF3xbvcOF1UhLewrzTZ6xI9Qijp0xcWEKCcNKYgsuO2Rx7kwhWGJjjKMjw3kCU/0N3VPxzMQ==}
+  '@sphereon/oid4vc-common@0.16.1-next.339':
+    resolution: {integrity: sha512-Ttw49G8liVpR/qZTuBX9YVI8vYb3rbtWAUr8Ra5GRGQo8+xE22dT5gMK0BwTeg6CRik3zhYnW6L4LN/NRPuhIA==}
     engines: {node: '>=18'}
 
-  '@sphereon/oid4vci-client@0.16.1-feature.SPRIND.89.257':
-    resolution: {integrity: sha512-LeY3pqki3JlGlgF5JnUgm1kJwnh2tSGdkNYmkY2uwZUh2lp56zpiQ0CYDiz7c3Ho6I3iddR2seV0FrORRYSGEA==}
+  '@sphereon/oid4vci-client@0.16.1-next.339':
+    resolution: {integrity: sha512-bPkiQGauf8LjkfI8LXVBw494Z8ttCT439420PlzWohm5aYytcEw7DL/Sn+5+ME+4aHzzb4khXAVqjpSlrySSDA==}
     engines: {node: '>=18'}
 
-  '@sphereon/oid4vci-common@0.16.1-feature.SPRIND.89.257':
-    resolution: {integrity: sha512-z2iDdWj2+2qrzIWk0k11i/jiwboZwGIzUuPJhzHeSGkoYVycRFYbSAwvsQ2YC/6p+xqtsxeTRuQ6n6BFle134Q==}
+  '@sphereon/oid4vci-common@0.16.1-next.339':
+    resolution: {integrity: sha512-ZZGh6xxtmeiJy5+sic8F+YZkZucx1vuYQ4wqG0bhcu17zOkvyqvW5S54G2o1K8ZVYjPTuBkI402nuqAoMGgLGg==}
     engines: {node: '>=18'}
 
-  '@sphereon/oid4vci-issuer-server@0.16.1-feature.SPRIND.89.257':
-    resolution: {integrity: sha512-afPxe+m8bmVQsMRkaNN7EjDj/Bfu14u1AKeZzhngbkyrL2eWznaO/ZYzhBK/ik/q0Zp7+opu3mUBiYgn0OiuYQ==}
+  '@sphereon/oid4vci-issuer-server@0.16.1-next.339':
+    resolution: {integrity: sha512-6Cbrs3PSPIY1tNTyCHYGLdQgLSu/ie38OIllyhrJLuCtCpxsdRR0AE0lQi06gJMpt6S90L1sKEPKbn2lLJF22Q==}
     engines: {node: '>=18'}
     peerDependencies:
       awesome-qr: ^2.1.5-rc.0
@@ -6073,8 +6073,8 @@ packages:
       awesome-qr:
         optional: true
 
-  '@sphereon/oid4vci-issuer@0.16.1-feature.SPRIND.89.257':
-    resolution: {integrity: sha512-sWqG2nrjkyRPsr8elgNTdzEP7glSt5D9LbB8f4AT5nZmX48PIa31jXntvawIaVdQkpGm1TN1ZBXez+Or2/W0/g==}
+  '@sphereon/oid4vci-issuer@0.16.1-next.339':
+    resolution: {integrity: sha512-1iGdjtle4KjzqEdYL7CLG7lijwPGebagkksan6C7FA5NlSUjnS8jUt9CElrHZY/pbznCVh+qfr/dBVbhl6uuUg==}
     engines: {node: '>=18'}
     peerDependencies:
       awesome-qr: ^2.1.5-rc.0
@@ -8177,6 +8177,9 @@ packages:
   dayjs@1.11.13:
     resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
 
+  dcql@0.2.19:
+    resolution: {integrity: sha512-/EvT8tArlg8zFsTQbRn6PijfeQ3nUwuEeCRDpptWcYqE8Wyt8J9Sb44gMPFzVCoIEb3R0M7Hl+XWkUMobC8jXQ==}
+
   debug@4.3.7:
     resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
     engines: {node: '>=6.0'}
@@ -13302,6 +13305,14 @@ packages:
       typescript:
         optional: true
 
+  valibot@1.0.0-beta.8:
+    resolution: {integrity: sha512-OPAwJZtowb0j91b+bd77+ny7D1VVzsCzD7Jl9waLUlMprTsfI9Y3HHbW3hAQD7wKDKHsmGEesuiYWaYvcZL2wg==}
+    peerDependencies:
+      typescript: 5.6.3
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   valid-url@1.0.9:
     resolution: {integrity: sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA==}
 
@@ -16990,11 +17001,11 @@ snapshots:
     dependencies:
       '@sinonjs/commons': 1.8.6
 
-  '@sphereon/did-auth-siop-adapter@0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)':
+  '@sphereon/did-auth-siop-adapter@0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)':
     dependencies:
-      '@sphereon/did-auth-siop': 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)
+      '@sphereon/did-auth-siop': 0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)
       '@sphereon/did-uni-client': 0.6.3(encoding@0.1.13)
-      '@sphereon/oid4vc-common': 0.16.1-feature.SPRIND.89.257
+      '@sphereon/oid4vc-common': 0.16.1-next.339
       '@sphereon/wellknown-dids-client': 0.1.3(encoding@0.1.13)
       did-jwt: 6.11.6(patch_hash=afqywxnnjnsy6hwgax66dyyiey)
       did-resolver: 4.1.0
@@ -17003,15 +17014,16 @@ snapshots:
       - supports-color
       - typescript
 
-  '@sphereon/did-auth-siop@0.16.1-feature.SPRIND.89.257(encoding@0.1.13)(typescript@5.6.3)':
+  '@sphereon/did-auth-siop@0.16.1-next.339(encoding@0.1.13)(typescript@5.6.3)':
     dependencies:
       '@astronautlabs/jsonpath': 1.1.2
-      '@sphereon/jarm': 0.16.1-feature.SPRIND.89.257(typescript@5.6.3)
-      '@sphereon/oid4vc-common': 0.16.1-feature.SPRIND.89.257
+      '@sphereon/jarm': 0.16.1-next.339(typescript@5.6.3)
+      '@sphereon/oid4vc-common': 0.16.1-next.339
       '@sphereon/pex': 5.0.0-unstable.28
       '@sphereon/pex-models': 2.3.2
       '@sphereon/ssi-types': link:packages/ssi-types
       cross-fetch: 4.0.0(encoding@0.1.13)
+      dcql: 0.2.19(typescript@5.6.3)
       debug: 4.3.7
       events: 3.3.0
       jwt-decode: 4.0.0
@@ -17068,9 +17080,9 @@ snapshots:
       react-native: 0.76.3(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(@types/react@18.3.12)(encoding@0.1.13)(react@18.3.1)
       uint8arrays: 3.1.1
 
-  '@sphereon/jarm@0.16.1-feature.SPRIND.89.257(typescript@5.6.3)':
+  '@sphereon/jarm@0.16.1-next.339(typescript@5.6.3)':
     dependencies:
-      '@sphereon/oid4vc-common': 0.16.1-feature.SPRIND.89.257
+      '@sphereon/oid4vc-common': 0.16.1-next.339
       valibot: 0.42.1(typescript@5.6.3)
     transitivePeerDependencies:
       - typescript
@@ -17094,7 +17106,7 @@ snapshots:
       - encoding
       - typescript
 
-  '@sphereon/oid4vc-common@0.16.1-feature.SPRIND.89.257':
+  '@sphereon/oid4vc-common@0.16.1-next.339':
     dependencies:
       '@sphereon/ssi-types': link:packages/ssi-types
       jwt-decode: 4.0.0
@@ -17102,10 +17114,10 @@ snapshots:
       uint8arrays: 3.1.1
       uuid: 9.0.1
 
-  '@sphereon/oid4vci-client@0.16.1-feature.SPRIND.89.257(encoding@0.1.13)':
+  '@sphereon/oid4vci-client@0.16.1-next.339(encoding@0.1.13)':
     dependencies:
-      '@sphereon/oid4vc-common': 0.16.1-feature.SPRIND.89.257
-      '@sphereon/oid4vci-common': 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+      '@sphereon/oid4vc-common': 0.16.1-next.339
+      '@sphereon/oid4vci-common': 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/ssi-types': link:packages/ssi-types
       cross-fetch: 3.1.8(encoding@0.1.13)
       debug: 4.3.7
@@ -17113,9 +17125,9 @@ snapshots:
       - encoding
       - supports-color
 
-  '@sphereon/oid4vci-common@0.16.1-feature.SPRIND.89.257(encoding@0.1.13)':
+  '@sphereon/oid4vci-common@0.16.1-next.339(encoding@0.1.13)':
     dependencies:
-      '@sphereon/oid4vc-common': 0.16.1-feature.SPRIND.89.257
+      '@sphereon/oid4vc-common': 0.16.1-next.339
       '@sphereon/ssi-types': link:packages/ssi-types
       cross-fetch: 3.1.8(encoding@0.1.13)
       debug: 4.3.7
@@ -17126,11 +17138,11 @@ snapshots:
       - encoding
       - supports-color
 
-  '@sphereon/oid4vci-issuer-server@0.16.1-feature.SPRIND.89.257(@noble/hashes@1.6.1)(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)(passport-azure-ad@4.3.5)(passport-http-bearer@1.0.1)':
+  '@sphereon/oid4vci-issuer-server@0.16.1-next.339(@noble/hashes@1.6.1)(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)(passport-azure-ad@4.3.5)(passport-http-bearer@1.0.1)':
     dependencies:
-      '@sphereon/oid4vc-common': 0.16.1-feature.SPRIND.89.257
-      '@sphereon/oid4vci-common': 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
-      '@sphereon/oid4vci-issuer': 0.16.1-feature.SPRIND.89.257(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)
+      '@sphereon/oid4vc-common': 0.16.1-next.339
+      '@sphereon/oid4vci-common': 0.16.1-next.339(encoding@0.1.13)
+      '@sphereon/oid4vci-issuer': 0.16.1-next.339(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)
       '@sphereon/ssi-express-support': 0.30.2-feature.mdoc.funke2.367(@noble/hashes@1.6.1)(passport-azure-ad@4.3.5)(passport-http-bearer@1.0.1)
       '@sphereon/ssi-types': link:packages/ssi-types
       body-parser: 1.20.3
@@ -17149,10 +17161,10 @@ snapshots:
       - passport-http-bearer
       - supports-color
 
-  '@sphereon/oid4vci-issuer@0.16.1-feature.SPRIND.89.257(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)':
+  '@sphereon/oid4vci-issuer@0.16.1-next.339(awesome-qr@2.1.5-rc.0(encoding@0.1.13))(encoding@0.1.13)':
     dependencies:
-      '@sphereon/oid4vc-common': 0.16.1-feature.SPRIND.89.257
-      '@sphereon/oid4vci-common': 0.16.1-feature.SPRIND.89.257(encoding@0.1.13)
+      '@sphereon/oid4vc-common': 0.16.1-next.339
+      '@sphereon/oid4vci-common': 0.16.1-next.339(encoding@0.1.13)
       '@sphereon/ssi-types': link:packages/ssi-types
       uuid: 9.0.1
     optionalDependencies:
@@ -20729,6 +20741,12 @@ snapshots:
 
   dayjs@1.11.13: {}
 
+  dcql@0.2.19(typescript@5.6.3):
+    dependencies:
+      valibot: 1.0.0-beta.8(typescript@5.6.3)
+    transitivePeerDependencies:
+      - typescript
+
   debug@4.3.7:
     dependencies:
       ms: 2.1.3
@@ -27165,6 +27183,10 @@ snapshots:
     optionalDependencies:
       typescript: 5.6.3
 
+  valibot@1.0.0-beta.8(typescript@5.6.3):
+    optionalDependencies:
+      typescript: 5.6.3
+
   valid-url@1.0.9: {}
 
   validate-npm-package-license@3.0.4: