diff --git a/bun.lock b/bun.lock
index 7c8bb77b5..f89b00be7 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "ohif-monorepo-root",
@@ -50,7 +51,7 @@
     },
     "addOns/externals/devDependencies": {
       "name": "@externals/devDependencies",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "@kitware/vtk.js": "34.15.1",
@@ -131,22 +132,22 @@
     },
     "addOns/externals/dicom-microscopy-viewer": {
       "name": "@externals/dicom-microscopy-viewer",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "dicom-microscopy-viewer": "0.48.17",
       },
     },
     "extensions/cornerstone": {
       "name": "@ohif/extension-cornerstone",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
-        "@cornerstonejs/adapters": "4.15.29",
-        "@cornerstonejs/ai": "4.15.29",
-        "@cornerstonejs/core": "4.15.29",
-        "@cornerstonejs/labelmap-interpolation": "4.15.29",
-        "@cornerstonejs/polymorphic-segmentation": "4.15.29",
-        "@cornerstonejs/tools": "4.15.29",
+        "@cornerstonejs/adapters": "4.17.2",
+        "@cornerstonejs/ai": "4.17.2",
+        "@cornerstonejs/core": "4.17.2",
+        "@cornerstonejs/labelmap-interpolation": "4.17.2",
+        "@cornerstonejs/polymorphic-segmentation": "4.17.2",
+        "@cornerstonejs/tools": "4.17.2",
         "@icr/polyseg-wasm": "0.4.0",
         "@itk-wasm/morphological-contour-interpolation": "1.1.0",
         "@kitware/vtk.js": "34.15.1",
@@ -164,9 +165,9 @@
         "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
         "@cornerstonejs/codec-openjpeg": "1.3.0",
         "@cornerstonejs/codec-openjph": "2.4.7",
-        "@cornerstonejs/dicom-image-loader": "4.15.29",
-        "@ohif/core": "3.13.0-beta.21",
-        "@ohif/ui": "3.13.0-beta.21",
+        "@cornerstonejs/dicom-image-loader": "4.17.2",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/ui": "3.13.0-beta.22",
         "dcmjs": "0.49.4",
         "dicom-parser": "1.8.21",
         "hammerjs": "2.0.8",
@@ -178,18 +179,18 @@
     },
     "extensions/cornerstone-dicom-pmap": {
       "name": "@ohif/extension-cornerstone-dicom-pmap",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
-        "@cornerstonejs/adapters": "4.15.29",
-        "@cornerstonejs/core": "4.15.29",
+        "@cornerstonejs/adapters": "4.17.2",
+        "@cornerstonejs/core": "4.17.2",
         "@kitware/vtk.js": "34.15.1",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone": "3.13.0-beta.15",
-        "@ohif/extension-default": "3.13.0-beta.15",
-        "@ohif/i18n": "3.13.0-beta.15",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/i18n": "3.13.0-beta.22",
         "prop-types": "15.8.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
@@ -200,15 +201,15 @@
     },
     "extensions/cornerstone-dicom-rt": {
       "name": "@ohif/extension-cornerstone-dicom-rt",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.18",
-        "@ohif/extension-cornerstone": "3.13.0-beta.18",
-        "@ohif/extension-default": "3.13.0-beta.18",
-        "@ohif/i18n": "3.13.0-beta.18",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/i18n": "3.13.0-beta.22",
         "prop-types": "15.8.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
@@ -219,18 +220,18 @@
     },
     "extensions/cornerstone-dicom-seg": {
       "name": "@ohif/extension-cornerstone-dicom-seg",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
-        "@cornerstonejs/adapters": "4.15.29",
-        "@cornerstonejs/core": "4.15.29",
+        "@cornerstonejs/adapters": "4.17.2",
+        "@cornerstonejs/core": "4.17.2",
         "@kitware/vtk.js": "34.15.1",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.18",
-        "@ohif/extension-cornerstone": "3.13.0-beta.18",
-        "@ohif/extension-default": "3.13.0-beta.18",
-        "@ohif/i18n": "3.13.0-beta.18",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/i18n": "3.13.0-beta.22",
         "prop-types": "15.8.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
@@ -241,19 +242,19 @@
     },
     "extensions/cornerstone-dicom-sr": {
       "name": "@ohif/extension-cornerstone-dicom-sr",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
-        "@cornerstonejs/adapters": "4.15.29",
-        "@cornerstonejs/core": "4.15.29",
-        "@cornerstonejs/tools": "4.15.29",
+        "@cornerstonejs/adapters": "4.17.2",
+        "@cornerstonejs/core": "4.17.2",
+        "@cornerstonejs/tools": "4.17.2",
         "classnames": "2.5.1",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.21",
-        "@ohif/extension-cornerstone": "3.13.0-beta.21",
-        "@ohif/extension-measurement-tracking": "3.13.0-beta.21",
-        "@ohif/ui": "3.13.0-beta.21",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-measurement-tracking": "3.13.0-beta.22",
+        "@ohif/ui": "3.13.0-beta.22",
         "dcmjs": "0.49.4",
         "dicom-parser": "1.8.21",
         "hammerjs": "2.0.8",
@@ -263,19 +264,19 @@
     },
     "extensions/cornerstone-dynamic-volume": {
       "name": "@ohif/extension-cornerstone-dynamic-volume",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
-        "@cornerstonejs/core": "4.15.29",
-        "@cornerstonejs/tools": "4.15.29",
+        "@cornerstonejs/core": "4.17.2",
+        "@cornerstonejs/tools": "4.17.2",
         "classnames": "2.5.1",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone": "3.13.0-beta.15",
-        "@ohif/extension-default": "3.13.0-beta.15",
-        "@ohif/i18n": "3.13.0-beta.15",
-        "@ohif/ui": "3.13.0-beta.15",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/i18n": "3.13.0-beta.22",
+        "@ohif/ui": "3.13.0-beta.22",
         "dcmjs": "0.49.4",
         "dicom-parser": "1.8.21",
         "hammerjs": "2.0.8",
@@ -285,7 +286,7 @@
     },
     "extensions/default": {
       "name": "@ohif/extension-default",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "@cornerstonejs/calculate-suv": "1.1.0",
@@ -294,8 +295,8 @@
         "react-color": "2.19.3",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.21",
-        "@ohif/i18n": "3.13.0-beta.21",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/i18n": "3.13.0-beta.22",
         "dcmjs": "0.49.4",
         "dicomweb-client": "0.10.4",
         "prop-types": "15.8.1",
@@ -309,7 +310,7 @@
     },
     "extensions/dicom-microscopy": {
       "name": "@ohif/extension-dicom-microscopy",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "@cornerstonejs/codec-charls": "1.2.3",
@@ -320,10 +321,10 @@
         "mathjs": "12.4.3",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.15",
-        "@ohif/extension-default": "3.13.0-beta.15",
-        "@ohif/i18n": "3.13.0-beta.15",
-        "@ohif/ui": "3.13.0-beta.15",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/i18n": "3.13.0-beta.22",
+        "@ohif/ui": "3.13.0-beta.22",
         "prop-types": "15.8.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
@@ -334,14 +335,14 @@
     },
     "extensions/dicom-pdf": {
       "name": "@ohif/extension-dicom-pdf",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "classnames": "2.5.1",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.18",
-        "@ohif/ui": "3.13.0-beta.18",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/ui": "3.13.0-beta.22",
         "dcmjs": "0.49.4",
         "dicom-parser": "1.8.21",
         "hammerjs": "2.0.8",
@@ -351,14 +352,14 @@
     },
     "extensions/dicom-video": {
       "name": "@ohif/extension-dicom-video",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "classnames": "2.5.1",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.18",
-        "@ohif/ui": "3.13.0-beta.18",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/ui": "3.13.0-beta.22",
         "dcmjs": "0.49.4",
         "dicom-parser": "1.8.21",
         "hammerjs": "2.0.8",
@@ -368,20 +369,20 @@
     },
     "extensions/measurement-tracking": {
       "name": "@ohif/extension-measurement-tracking",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
-        "@ohif/ui": "3.13.0-beta.21",
+        "@ohif/ui": "3.13.0-beta.22",
         "@xstate/react": "3.2.2",
         "xstate": "4.38.3",
       },
       "peerDependencies": {
-        "@cornerstonejs/core": "4.15.29",
-        "@cornerstonejs/tools": "4.15.29",
-        "@ohif/core": "3.13.0-beta.21",
-        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.21",
-        "@ohif/extension-default": "3.13.0-beta.21",
-        "@ohif/ui": "3.13.0-beta.21",
+        "@cornerstonejs/core": "4.17.2",
+        "@cornerstonejs/tools": "4.17.2",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/ui": "3.13.0-beta.22",
         "classnames": "2.5.1",
         "dcmjs": "0.49.4",
         "lodash.debounce": "4.0.8",
@@ -394,14 +395,14 @@
     },
     "extensions/test-extension": {
       "name": "@ohif/extension-test",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "classnames": "2.5.1",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.15",
-        "@ohif/ui": "3.13.0-beta.15",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/ui": "3.13.0-beta.22",
         "dcmjs": "0.49.4",
         "dicom-parser": "1.8.21",
         "hammerjs": "2.0.8",
@@ -411,7 +412,7 @@
     },
     "extensions/tmtv": {
       "name": "@ohif/extension-tmtv",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "classnames": "2.5.1",
@@ -428,16 +429,16 @@
     },
     "extensions/usAnnotation": {
       "name": "@ohif/extension-ultrasound-pleura-bline",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
-        "@cornerstonejs/core": "4.15.29",
-        "@cornerstonejs/tools": "4.15.29",
-        "@ohif/core": "3.13.0-beta.18",
-        "@ohif/extension-cornerstone": "3.13.0-beta.18",
-        "@ohif/extension-default": "3.13.0-beta.18",
-        "@ohif/i18n": "3.13.0-beta.18",
-        "@ohif/ui-next": "3.13.0-beta.18",
+        "@cornerstonejs/core": "4.17.2",
+        "@cornerstonejs/tools": "4.17.2",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/i18n": "3.13.0-beta.22",
+        "@ohif/ui-next": "3.13.0-beta.22",
       },
       "devDependencies": {
         "@babel/core": "7.28.0",
@@ -476,7 +477,7 @@
     },
     "modes/basic": {
       "name": "@ohif/mode-basic",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
       },
@@ -485,19 +486,19 @@
         "webpack-merge": "5.10.0",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.18",
-        "@ohif/extension-cornerstone": "3.13.0-beta.18",
-        "@ohif/extension-cornerstone-dicom-rt": "3.13.0-beta.18",
-        "@ohif/extension-cornerstone-dicom-seg": "3.13.0-beta.18",
-        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.18",
-        "@ohif/extension-default": "3.13.0-beta.18",
-        "@ohif/extension-dicom-pdf": "3.13.0-beta.18",
-        "@ohif/extension-dicom-video": "3.13.0-beta.18",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-rt": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-seg": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/extension-dicom-pdf": "3.13.0-beta.22",
+        "@ohif/extension-dicom-video": "3.13.0-beta.22",
       },
     },
     "modes/basic-dev-mode": {
       "name": "@ohif/mode-basic-dev-mode",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "i18next": "17.3.1",
@@ -507,17 +508,17 @@
         "webpack-merge": "5.10.0",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.15",
-        "@ohif/extension-default": "3.13.0-beta.15",
-        "@ohif/extension-dicom-pdf": "3.13.0-beta.15",
-        "@ohif/extension-dicom-video": "3.13.0-beta.15",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/extension-dicom-pdf": "3.13.0-beta.22",
+        "@ohif/extension-dicom-video": "3.13.0-beta.22",
       },
     },
     "modes/basic-test-mode": {
       "name": "@ohif/mode-test",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "i18next": "17.3.1",
@@ -527,19 +528,19 @@
         "webpack-merge": "5.10.0",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.15",
-        "@ohif/extension-default": "3.13.0-beta.15",
-        "@ohif/extension-dicom-pdf": "3.13.0-beta.15",
-        "@ohif/extension-dicom-video": "3.13.0-beta.15",
-        "@ohif/extension-measurement-tracking": "3.13.0-beta.15",
-        "@ohif/extension-test": "3.13.0-beta.15",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/extension-dicom-pdf": "3.13.0-beta.22",
+        "@ohif/extension-dicom-video": "3.13.0-beta.22",
+        "@ohif/extension-measurement-tracking": "3.13.0-beta.22",
+        "@ohif/extension-test": "3.13.0-beta.22",
       },
     },
     "modes/longitudinal": {
       "name": "@ohif/mode-longitudinal",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "i18next": "17.3.1",
@@ -549,33 +550,33 @@
         "webpack-merge": "5.10.0",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone-dicom-rt": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone-dicom-seg": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.15",
-        "@ohif/extension-default": "3.13.0-beta.15",
-        "@ohif/extension-dicom-pdf": "3.13.0-beta.15",
-        "@ohif/extension-dicom-video": "3.13.0-beta.15",
-        "@ohif/extension-measurement-tracking": "3.13.0-beta.15",
-        "@ohif/mode-basic": "3.13.0-beta.15",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-rt": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-seg": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/extension-dicom-pdf": "3.13.0-beta.22",
+        "@ohif/extension-dicom-video": "3.13.0-beta.22",
+        "@ohif/extension-measurement-tracking": "3.13.0-beta.22",
+        "@ohif/mode-basic": "3.13.0-beta.22",
       },
     },
     "modes/microscopy": {
       "name": "@ohif/mode-microscopy",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "i18next": "17.3.1",
       },
       "peerDependencies": {
-        "@ohif/core": "3.13.0-beta.15",
-        "@ohif/extension-dicom-microscopy": "3.13.0-beta.15",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-dicom-microscopy": "3.13.0-beta.22",
       },
     },
     "modes/preclinical-4d": {
       "name": "@ohif/mode-preclinical-4d",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
       },
@@ -594,7 +595,7 @@
     },
     "modes/segmentation": {
       "name": "@ohif/mode-segmentation",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "i18next": "17.3.1",
@@ -636,7 +637,7 @@
     },
     "modes/tmtv": {
       "name": "@ohif/mode-tmtv",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "i18next": "17.3.1",
@@ -657,14 +658,14 @@
     },
     "modes/usAnnotation": {
       "name": "@ohif/mode-ultrasound-pleura-bline",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
-        "@cornerstonejs/core": "4.15.29",
-        "@cornerstonejs/tools": "4.15.29",
-        "@ohif/core": "3.13.0-beta.18",
-        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.18",
-        "@ohif/extension-ultrasound-pleura-bline": "3.13.0-beta.18",
+        "@cornerstonejs/core": "4.17.2",
+        "@cornerstonejs/tools": "4.17.2",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.22",
+        "@ohif/extension-ultrasound-pleura-bline": "3.13.0-beta.22",
         "i18next": "17.3.1",
       },
       "devDependencies": {
@@ -693,34 +694,34 @@
     },
     "platform/app": {
       "name": "@ohif/app",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "@cornerstonejs/codec-charls": "1.2.3",
         "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
         "@cornerstonejs/codec-openjpeg": "1.3.0",
         "@cornerstonejs/codec-openjph": "2.4.7",
-        "@cornerstonejs/dicom-image-loader": "4.15.29",
+        "@cornerstonejs/dicom-image-loader": "4.17.2",
         "@emotion/serialize": "1.3.3",
-        "@ohif/core": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone-dicom-rt": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone-dicom-seg": "3.13.0-beta.15",
-        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.15",
-        "@ohif/extension-default": "3.13.0-beta.15",
-        "@ohif/extension-dicom-microscopy": "3.13.0-beta.15",
-        "@ohif/extension-dicom-pdf": "3.13.0-beta.15",
-        "@ohif/extension-dicom-video": "3.13.0-beta.15",
-        "@ohif/extension-test": "3.13.0-beta.15",
-        "@ohif/extension-ultrasound-pleura-bline": "3.13.0-beta.15",
-        "@ohif/i18n": "3.13.0-beta.15",
-        "@ohif/mode-basic-dev-mode": "3.13.0-beta.15",
-        "@ohif/mode-longitudinal": "3.13.0-beta.15",
-        "@ohif/mode-microscopy": "3.13.0-beta.15",
-        "@ohif/mode-test": "3.13.0-beta.15",
-        "@ohif/mode-ultrasound-pleura-bline": "3.13.0-beta.15",
-        "@ohif/ui": "3.13.0-beta.15",
-        "@ohif/ui-next": "3.13.0-beta.15",
+        "@ohif/core": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-rt": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-seg": "3.13.0-beta.22",
+        "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.22",
+        "@ohif/extension-default": "3.13.0-beta.22",
+        "@ohif/extension-dicom-microscopy": "3.13.0-beta.22",
+        "@ohif/extension-dicom-pdf": "3.13.0-beta.22",
+        "@ohif/extension-dicom-video": "3.13.0-beta.22",
+        "@ohif/extension-test": "3.13.0-beta.22",
+        "@ohif/extension-ultrasound-pleura-bline": "3.13.0-beta.22",
+        "@ohif/i18n": "3.13.0-beta.22",
+        "@ohif/mode-basic-dev-mode": "3.13.0-beta.22",
+        "@ohif/mode-longitudinal": "3.13.0-beta.22",
+        "@ohif/mode-microscopy": "3.13.0-beta.22",
+        "@ohif/mode-test": "3.13.0-beta.22",
+        "@ohif/mode-ultrasound-pleura-bline": "3.13.0-beta.22",
+        "@ohif/ui": "3.13.0-beta.22",
+        "@ohif/ui-next": "3.13.0-beta.22",
         "@svgr/webpack": "8.1.0",
         "@types/react": "18.3.23",
         "classnames": "2.5.1",
@@ -772,7 +773,7 @@
     },
     "platform/cli": {
       "name": "@ohif/cli",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "bin": {
         "ohif-cli": "src/index.js",
       },
@@ -796,7 +797,7 @@
     },
     "platform/core": {
       "name": "@ohif/core",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "dcmjs": "0.49.4",
@@ -821,16 +822,16 @@
         "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
         "@cornerstonejs/codec-openjpeg": "1.3.0",
         "@cornerstonejs/codec-openjph": "2.4.7",
-        "@cornerstonejs/core": "4.15.29",
-        "@cornerstonejs/dicom-image-loader": "4.15.29",
-        "@ohif/ui": "3.13.0-beta.21",
+        "@cornerstonejs/core": "4.17.2",
+        "@cornerstonejs/dicom-image-loader": "4.17.2",
+        "@ohif/ui": "3.13.0-beta.22",
         "cornerstone-math": "0.1.9",
         "dicom-parser": "1.8.21",
       },
     },
     "platform/i18n": {
       "name": "@ohif/i18n",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@babel/runtime": "7.28.2",
         "i18next-locize-backend": "2.2.2",
@@ -855,7 +856,7 @@
     },
     "platform/ui": {
       "name": "@ohif/ui",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@testing-library/react": "13.4.0",
         "browser-detect": "0.2.28",
@@ -905,7 +906,7 @@
     },
     "platform/ui-next": {
       "name": "@ohif/ui-next",
-      "version": "3.13.0-beta.21",
+      "version": "3.13.0-beta.22",
       "dependencies": {
         "@radix-ui/react-accordion": "1.2.11",
         "@radix-ui/react-checkbox": "1.3.2",
@@ -1237,9 +1238,9 @@
 
     "@bcoe/v8-coverage": ["@bcoe/v8-coverage@0.2.3", "", {}, "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="],
 
-    "@cornerstonejs/adapters": ["@cornerstonejs/adapters@4.15.29", "", { "dependencies": { "@babel/runtime-corejs2": "7.26.10", "buffer": "6.0.3", "dcmjs": "0.48.0", "gl-matrix": "3.4.3", "ndarray": "1.0.19" }, "peerDependencies": { "@cornerstonejs/core": "4.15.29", "@cornerstonejs/tools": "4.15.29" } }, "sha512-OcG3YtCQ+C7X/f7buK3dsMOc8NyqsgH/LZRT/JbvppUnqhhfyKIpBTtJG+2+roMyLsi3QrsCeI9Eu6KaQgFFvw=="],
+    "@cornerstonejs/adapters": ["@cornerstonejs/adapters@4.17.2", "", { "dependencies": { "@babel/runtime-corejs2": "7.26.10", "buffer": "6.0.3", "dcmjs": "0.49.4", "gl-matrix": "3.4.3", "ndarray": "1.0.19" }, "peerDependencies": { "@cornerstonejs/core": "4.17.2", "@cornerstonejs/tools": "4.17.2" } }, "sha512-R3WMkIg7F3vcHduLMiINGv1ETl7xS+BI2m5W41RAmHmroOzwBngloVO52juwr+iU7obMKuyLDgZ3e8NdzRMt7g=="],
 
-    "@cornerstonejs/ai": ["@cornerstonejs/ai@4.15.29", "", { "dependencies": { "@babel/runtime-corejs2": "7.26.10", "buffer": "6.0.3", "dcmjs": "0.48.0", "gl-matrix": "3.4.3", "lodash.clonedeep": "4.5.0", "ndarray": "1.0.19", "onnxruntime-common": "1.17.1", "onnxruntime-web": "1.17.1" }, "peerDependencies": { "@cornerstonejs/core": "4.15.29", "@cornerstonejs/tools": "4.15.29" } }, "sha512-fTbfAE7HpXES+vPYzhP0eGljmwykGkbY38LymbMsrn7p6DmvKuJIh4sfUzUtIPW+5kMnCiXAEUhi3+oebQZs0g=="],
+    "@cornerstonejs/ai": ["@cornerstonejs/ai@4.17.2", "", { "dependencies": { "@babel/runtime-corejs2": "7.26.10", "buffer": "6.0.3", "dcmjs": "0.49.4", "gl-matrix": "3.4.3", "lodash.clonedeep": "4.5.0", "ndarray": "1.0.19", "onnxruntime-common": "1.17.1", "onnxruntime-web": "1.17.1" }, "peerDependencies": { "@cornerstonejs/core": "4.17.2", "@cornerstonejs/tools": "4.17.2" } }, "sha512-/JIK3zQzQlnS4hjLcQWiuBHngPMnTRQCodFcS/hf/0jm9Aiz7tfWMqzYptcgWNV5Ssg6sjpmarBY4DcPdJ2qaw=="],
 
     "@cornerstonejs/calculate-suv": ["@cornerstonejs/calculate-suv@1.1.0", "", {}, "sha512-Q9XraiDJif9aMFArD2iEuDO/HXbcRVCqB7KfaHgDrdTTjgDFovS91Psbdim7crypRSvE6dh/+HKeFNHdvNkA6w=="],
 
@@ -1251,15 +1252,15 @@
 
     "@cornerstonejs/codec-openjph": ["@cornerstonejs/codec-openjph@2.4.7", "", {}, "sha512-qvP4q4JDib7mi9r7LqKOwqz7YZ8gjtDX4ZCezeYf8+eb7MBXCz5uXAMeVF3yz9Axw4XiIMdB/pqXkm8tqCl13w=="],
 
-    "@cornerstonejs/core": ["@cornerstonejs/core@4.15.29", "", { "dependencies": { "@kitware/vtk.js": "34.15.1", "comlink": "4.4.2", "gl-matrix": "3.4.3", "loglevel": "1.9.2" } }, "sha512-o+5gXbxtZde1GIULmw+hWwf6KI3eiXCre0U1C372jbovxA66JH2t+2VW1nj0F2JRRnO0FjgT/+DWYCWt0ILGoA=="],
+    "@cornerstonejs/core": ["@cornerstonejs/core@4.17.2", "", { "dependencies": { "@kitware/vtk.js": "34.15.1", "comlink": "4.4.2", "gl-matrix": "3.4.3", "loglevel": "1.9.2" } }, "sha512-RjtecSOgS7KGeRdFSZwJ9CGU12iNyriQxwuQxF62G1Lkr1hakFTF9i7vS/t6tWhecLqkuefxfe7+pJaXm3M8vQ=="],
 
-    "@cornerstonejs/dicom-image-loader": ["@cornerstonejs/dicom-image-loader@4.15.29", "", { "dependencies": { "@cornerstonejs/codec-charls": "1.2.3", "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2", "@cornerstonejs/codec-openjpeg": "1.3.0", "@cornerstonejs/codec-openjph": "2.4.7", "comlink": "4.4.2", "dicom-parser": "1.8.21", "jpeg-lossless-decoder-js": "2.1.2", "pako": "2.1.0", "uuid": "9.0.1" }, "peerDependencies": { "@cornerstonejs/core": "4.15.29" } }, "sha512-+R7NoFyVTz2OSKclVQ21dqwgYmFM5q7SZc59YPcxfop7rk2+9H5rRxa04ytKHPjz+N5AlqbLKpJvy/RE10Xcew=="],
+    "@cornerstonejs/dicom-image-loader": ["@cornerstonejs/dicom-image-loader@4.17.2", "", { "dependencies": { "@cornerstonejs/codec-charls": "1.2.3", "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2", "@cornerstonejs/codec-openjpeg": "1.3.0", "@cornerstonejs/codec-openjph": "2.4.7", "comlink": "4.4.2", "dicom-parser": "1.8.21", "jpeg-lossless-decoder-js": "2.1.2", "pako": "2.1.0", "uuid": "9.0.1" }, "peerDependencies": { "@cornerstonejs/core": "4.17.2" } }, "sha512-I6x3ZLTwYy2nqlbBhFpoSkMQZ+UqIx1PM2/8lJk/mgfoCjb8MoEQ2mPQvJL6xdUIvViEGG2bg5iCmoCzKM3lCg=="],
 
-    "@cornerstonejs/labelmap-interpolation": ["@cornerstonejs/labelmap-interpolation@4.15.29", "", { "dependencies": { "@itk-wasm/morphological-contour-interpolation": "1.1.0", "itk-wasm": "1.0.0-b.165" }, "peerDependencies": { "@cornerstonejs/core": "4.15.29", "@cornerstonejs/tools": "4.15.29", "@kitware/vtk.js": "34.15.1" } }, "sha512-4pZTcZWv88l59HDSd/arlJ/WNcdxf9WZbm4GiwsrOZxKx8vkLivnKA+pjPUu1LugCJjlLMgugEVnBhZCk+hW7w=="],
+    "@cornerstonejs/labelmap-interpolation": ["@cornerstonejs/labelmap-interpolation@4.17.2", "", { "dependencies": { "@itk-wasm/morphological-contour-interpolation": "1.1.0", "itk-wasm": "1.0.0-b.165" }, "peerDependencies": { "@cornerstonejs/core": "4.17.2", "@cornerstonejs/tools": "4.17.2", "@kitware/vtk.js": "34.15.1" } }, "sha512-BhkTmxCiMhYn4j+AnasowtOewDq6FYkyB3YzL97Fj4ycfwijY5IyH23SH8Dzopcqysssc6C0AD4+tvIhiMz+xg=="],
 
-    "@cornerstonejs/polymorphic-segmentation": ["@cornerstonejs/polymorphic-segmentation@4.15.29", "", { "dependencies": { "@icr/polyseg-wasm": "0.4.0" }, "peerDependencies": { "@cornerstonejs/core": "4.15.29", "@cornerstonejs/tools": "4.15.29", "@kitware/vtk.js": "34.15.1" } }, "sha512-EMCw2Y+bjtI3qfCAv1VbAumWH8XNokEMA1roI03jLzaCvr0+8Jts9Z3P4kyQmOm60veaad9214yM9IZ41J4zGQ=="],
+    "@cornerstonejs/polymorphic-segmentation": ["@cornerstonejs/polymorphic-segmentation@4.17.2", "", { "dependencies": { "@icr/polyseg-wasm": "0.4.0" }, "peerDependencies": { "@cornerstonejs/core": "4.17.2", "@cornerstonejs/tools": "4.17.2", "@kitware/vtk.js": "34.15.1" } }, "sha512-l7db5Gp/mFq6ALv+TxxVF0eb/7tizJpymvN+2vpQBW/Fma8AgZznNQluqRXykgFBAqgkWonvATwH/MihegVv7A=="],
 
-    "@cornerstonejs/tools": ["@cornerstonejs/tools@4.15.29", "", { "dependencies": { "@types/offscreencanvas": "2019.7.3", "comlink": "4.4.2", "lodash.get": "4.4.2" }, "peerDependencies": { "@cornerstonejs/core": "4.15.29", "@kitware/vtk.js": "34.15.1", "@types/d3-array": "3.2.1", "@types/d3-interpolate": "3.0.4", "d3-array": "3.2.4", "d3-interpolate": "3.0.1", "gl-matrix": "3.4.3" } }, "sha512-MG+RPJ8EUyT3tWcHimSoDHOTeodNQAz7vPG+H03BjkbRu2RPsRVQRqSqoWHkyTOgyUv1XTk0JXJTXZQ/I7xcdA=="],
+    "@cornerstonejs/tools": ["@cornerstonejs/tools@4.17.2", "", { "dependencies": { "@types/offscreencanvas": "2019.7.3", "comlink": "4.4.2", "lodash.get": "4.4.2" }, "peerDependencies": { "@cornerstonejs/core": "4.17.2", "@kitware/vtk.js": "34.15.1", "@types/d3-array": "3.2.1", "@types/d3-interpolate": "3.0.4", "d3-array": "3.2.4", "d3-interpolate": "3.0.1", "gl-matrix": "3.4.3" } }, "sha512-ms9jO5ZIhaJ0YVZtfQ9uXKrIfc3XLt/WQGz3Wv7inLnAwLziPKvWHqWaMpn58kqwTfjxb7quJsLU+Z+DknqQMg=="],
 
     "@cspotcode/source-map-support": ["@cspotcode/source-map-support@0.8.1", "", { "dependencies": { "@jridgewell/trace-mapping": "0.3.9" } }, "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="],
 
diff --git a/extensions/cornerstone-dicom-pmap/package.json b/extensions/cornerstone-dicom-pmap/package.json
index 3a85a4b15..c4c449ab9 100644
--- a/extensions/cornerstone-dicom-pmap/package.json
+++ b/extensions/cornerstone-dicom-pmap/package.json
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@cornerstonejs/adapters": "4.15.29",
-    "@cornerstonejs/core": "4.15.29",
+    "@cornerstonejs/adapters": "4.17.2",
+    "@cornerstonejs/core": "4.17.2",
     "@kitware/vtk.js": "34.15.1"
   }
 }
diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json
index 266c959aa..06de9a3a9 100644
--- a/extensions/cornerstone-dicom-seg/package.json
+++ b/extensions/cornerstone-dicom-seg/package.json
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@cornerstonejs/adapters": "4.15.29",
-    "@cornerstonejs/core": "4.15.29",
+    "@cornerstonejs/adapters": "4.17.2",
+    "@cornerstonejs/core": "4.17.2",
     "@kitware/vtk.js": "34.15.1"
   }
 }
diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json
index 664b716a8..d21faa294 100644
--- a/extensions/cornerstone-dicom-sr/package.json
+++ b/extensions/cornerstone-dicom-sr/package.json
@@ -46,9 +46,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@cornerstonejs/adapters": "4.15.29",
-    "@cornerstonejs/core": "4.15.29",
-    "@cornerstonejs/tools": "4.15.29",
+    "@cornerstonejs/adapters": "4.17.2",
+    "@cornerstonejs/core": "4.17.2",
+    "@cornerstonejs/tools": "4.17.2",
     "classnames": "2.5.1"
   }
 }
diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json
index 29cd89d41..2cd57af33 100644
--- a/extensions/cornerstone-dynamic-volume/package.json
+++ b/extensions/cornerstone-dynamic-volume/package.json
@@ -42,8 +42,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@cornerstonejs/core": "4.15.29",
-    "@cornerstonejs/tools": "4.15.29",
+    "@cornerstonejs/core": "4.17.2",
+    "@cornerstonejs/tools": "4.17.2",
     "classnames": "2.5.1"
   }
 }
diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
index 076a3167b..c3e880bf5 100644
--- a/extensions/cornerstone/package.json
+++ b/extensions/cornerstone/package.json
@@ -40,7 +40,7 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
     "@cornerstonejs/codec-openjpeg": "1.3.0",
     "@cornerstonejs/codec-openjph": "2.4.7",
-    "@cornerstonejs/dicom-image-loader": "4.15.29",
+    "@cornerstonejs/dicom-image-loader": "4.17.2",
     "@ohif/core": "3.13.0-beta.22",
     "@ohif/ui": "3.13.0-beta.22",
     "dcmjs": "0.49.4",
@@ -53,12 +53,12 @@
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@cornerstonejs/adapters": "4.15.29",
-    "@cornerstonejs/ai": "4.15.29",
-    "@cornerstonejs/core": "4.15.29",
-    "@cornerstonejs/labelmap-interpolation": "4.15.29",
-    "@cornerstonejs/polymorphic-segmentation": "4.15.29",
-    "@cornerstonejs/tools": "4.15.29",
+    "@cornerstonejs/adapters": "4.17.2",
+    "@cornerstonejs/ai": "4.17.2",
+    "@cornerstonejs/core": "4.17.2",
+    "@cornerstonejs/labelmap-interpolation": "4.17.2",
+    "@cornerstonejs/polymorphic-segmentation": "4.17.2",
+    "@cornerstonejs/tools": "4.17.2",
     "@icr/polyseg-wasm": "0.4.0",
     "@itk-wasm/morphological-contour-interpolation": "1.1.0",
     "@kitware/vtk.js": "34.15.1",
diff --git a/extensions/default/src/getSopClassHandlerModule.js b/extensions/default/src/getSopClassHandlerModule.js
index 1355abd6a..b45a85134 100644
--- a/extensions/default/src/getSopClassHandlerModule.js
+++ b/extensions/default/src/getSopClassHandlerModule.js
@@ -6,13 +6,7 @@ import getDisplaySetsFromUnsupportedSeries from './getDisplaySetsFromUnsupported
 import { chartHandler } from './SOPClassHandlers/chartSOPClassHandler';
 import { metaData } from '@cornerstonejs/core';
 
-const {
-  isImage,
-  sortStudyInstances,
-  instancesSortCriteria,
-  sopClassDictionary,
-  isDisplaySetReconstructable,
-} = utils;
+const { isImage, sortStudyInstances, sopClassDictionary, isDisplaySetReconstructable } = utils;
 const { ImageSet } = classes;
 
 const DEFAULT_VOLUME_LOADER_SCHEME = 'cornerstoneStreamingImageVolume';
@@ -267,6 +261,7 @@ const sopClassUids = [
   sopClassDictionary.XRay3DAngiographicImageStorage,
   sopClassDictionary.XRay3DCraniofacialImageStorage,
   sopClassDictionary.BreastTomosynthesisImageStorage,
+  sopClassDictionary.CornealTopographyMapStorage,
   sopClassDictionary.BreastProjectionXRayImageStorageForPresentation,
   sopClassDictionary.BreastProjectionXRayImageStorageForProcessing,
   sopClassDictionary.IntravascularOpticalCoherenceTomographyImageStorageForPresentation,
diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json
index cbe65ae4f..793685b00 100644
--- a/extensions/measurement-tracking/package.json
+++ b/extensions/measurement-tracking/package.json
@@ -32,8 +32,8 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.15.29",
-    "@cornerstonejs/tools": "4.15.29",
+    "@cornerstonejs/core": "4.17.2",
+    "@cornerstonejs/tools": "4.17.2",
     "@ohif/core": "3.13.0-beta.22",
     "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.22",
     "@ohif/extension-default": "3.13.0-beta.22",
diff --git a/extensions/usAnnotation/package.json b/extensions/usAnnotation/package.json
index 5576d1577..38d7c3a67 100644
--- a/extensions/usAnnotation/package.json
+++ b/extensions/usAnnotation/package.json
@@ -42,8 +42,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@cornerstonejs/core": "4.15.29",
-    "@cornerstonejs/tools": "4.15.29",
+    "@cornerstonejs/core": "4.17.2",
+    "@cornerstonejs/tools": "4.17.2",
     "@ohif/core": "3.13.0-beta.22",
     "@ohif/extension-cornerstone": "3.13.0-beta.22",
     "@ohif/extension-default": "3.13.0-beta.22",
diff --git a/modes/usAnnotation/package.json b/modes/usAnnotation/package.json
index eac4fb9be..9d2c0b81a 100644
--- a/modes/usAnnotation/package.json
+++ b/modes/usAnnotation/package.json
@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@cornerstonejs/core": "4.15.29",
-    "@cornerstonejs/tools": "4.15.29",
+    "@cornerstonejs/core": "4.17.2",
+    "@cornerstonejs/tools": "4.17.2",
     "@ohif/core": "3.13.0-beta.22",
     "@ohif/extension-cornerstone-dicom-sr": "3.13.0-beta.22",
     "@ohif/extension-ultrasound-pleura-bline": "3.13.0-beta.22",
diff --git a/platform/app/package.json b/platform/app/package.json
index eff836c95..235b4d3b2 100644
--- a/platform/app/package.json
+++ b/platform/app/package.json
@@ -54,7 +54,7 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
     "@cornerstonejs/codec-openjpeg": "1.3.0",
     "@cornerstonejs/codec-openjph": "2.4.7",
-    "@cornerstonejs/dicom-image-loader": "4.15.29",
+    "@cornerstonejs/dicom-image-loader": "4.17.2",
     "@emotion/serialize": "1.3.3",
     "@ohif/core": "3.13.0-beta.22",
     "@ohif/extension-cornerstone": "3.13.0-beta.22",
diff --git a/platform/core/package.json b/platform/core/package.json
index 1590c5937..165012cbd 100644
--- a/platform/core/package.json
+++ b/platform/core/package.json
@@ -37,8 +37,8 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
     "@cornerstonejs/codec-openjpeg": "1.3.0",
     "@cornerstonejs/codec-openjph": "2.4.7",
-    "@cornerstonejs/core": "4.15.29",
-    "@cornerstonejs/dicom-image-loader": "4.15.29",
+    "@cornerstonejs/core": "4.17.2",
+    "@cornerstonejs/dicom-image-loader": "4.17.2",
     "@ohif/ui": "3.13.0-beta.22",
     "cornerstone-math": "0.1.9",
     "dicom-parser": "1.8.21"
diff --git a/platform/core/src/utils/metadataProvider/fetchPaletteColorLookupTableData.js b/platform/core/src/utils/metadataProvider/fetchPaletteColorLookupTableData.js
index 8dd053cbd..f35dacde5 100644
--- a/platform/core/src/utils/metadataProvider/fetchPaletteColorLookupTableData.js
+++ b/platform/core/src/utils/metadataProvider/fetchPaletteColorLookupTableData.js
@@ -22,8 +22,10 @@ export default function fetchPaletteColorLookupTableData(item, tag, descriptorTa
 }
 
 function _getPaletteColor(paletteColorLookupTableData, lutDescriptor) {
-  const numLutEntries = lutDescriptor[0];
-  const bits = lutDescriptor[2];
+  // DICOM standard says to use 64k instead of 0 as 64k isn't specifiable in
+  // 2 bytes.
+  const numLutEntries = lutDescriptor[0] || 65536;
+  const bitsAllocated = lutDescriptor[2];
 
   if (!paletteColorLookupTableData) {
     return undefined;
@@ -32,7 +34,11 @@ function _getPaletteColor(paletteColorLookupTableData, lutDescriptor) {
   const arrayBufferToPaletteColorLUT = arraybuffer => {
     // Handle both ArrayBuffer and TypedArray inputs
     const buffer = arraybuffer.buffer || arraybuffer;
-    const data = bits === 16 ? new Uint16Array(buffer) : new Uint8Array(buffer);
+    // See note in PS3.3 C7.6.3.1.5 around 8 bit data encoded as 16 bit
+    const data =
+      buffer.byteLength === 2 * numLutEntries || bitsAllocated > 8
+        ? new Uint16Array(buffer)
+        : new Uint8Array(buffer);
     const lut = [];
 
     for (let i = 0; i < numLutEntries; i++) {
@@ -58,6 +64,13 @@ function _getPaletteColor(paletteColorLookupTableData, lutDescriptor) {
     }
   }
 
+  const arrayPalette = Array.isArray(paletteColorLookupTableData)
+    ? paletteColorLookupTableData[0]
+    : paletteColorLookupTableData;
+  if (arrayPalette instanceof ArrayBuffer) {
+    return (paletteColorLookupTableData.palette = arrayBufferToPaletteColorLUT(arrayPalette));
+  }
+
   if (paletteColorLookupTableData.retrieveBulkData) {
     return paletteColorLookupTableData
       .retrieveBulkData()
diff --git a/testdata b/testdata
index bd743ed76..3f85fe843 160000
--- a/testdata
+++ b/testdata
@@ -1 +1 @@
-Subproject commit bd743ed76b403e6d476e1af0bbfe7479d96b563d
+Subproject commit 3f85fe843c9a1ffaccb826845f317dace9c06c45
diff --git a/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly0.png b/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly0.png
index a7e8943ec..79daa4968 100644
Binary files a/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly0.png and b/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly0.png differ
diff --git a/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly1.png b/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly1.png
index f499b3429..0b0d55689 100644
Binary files a/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly1.png and b/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly1.png differ
diff --git a/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly2.png b/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly2.png
index 51ddfecad..290f97d32 100644
Binary files a/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly2.png and b/tests/screenshots/chromium/ArrowAnnotate.spec.ts/arrowAnnotateDisplayedCorrectly2.png differ
diff --git a/yarn.lock b/yarn.lock
index d9bfdae7e..3cc82d981 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1946,25 +1946,25 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cornerstonejs/adapters@4.15.29":
-  version "4.15.29"
-  resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-4.15.29.tgz#cd8a60c72db55a76f8e0489ad825bf0f28b0f625"
-  integrity sha512-OcG3YtCQ+C7X/f7buK3dsMOc8NyqsgH/LZRT/JbvppUnqhhfyKIpBTtJG+2+roMyLsi3QrsCeI9Eu6KaQgFFvw==
+"@cornerstonejs/adapters@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-4.17.2.tgz#0ed507e4fbddf435802cab14054a8b750fab531b"
+  integrity sha512-R3WMkIg7F3vcHduLMiINGv1ETl7xS+BI2m5W41RAmHmroOzwBngloVO52juwr+iU7obMKuyLDgZ3e8NdzRMt7g==
   dependencies:
     "@babel/runtime-corejs2" "7.26.10"
     buffer "6.0.3"
-    dcmjs "0.48.0"
+    dcmjs "0.49.4"
     gl-matrix "3.4.3"
     ndarray "1.0.19"
 
-"@cornerstonejs/ai@4.15.29":
-  version "4.15.29"
-  resolved "https://registry.yarnpkg.com/@cornerstonejs/ai/-/ai-4.15.29.tgz#f2f8a10b51822afe525dda7a627fc12bc3cd3e3a"
-  integrity sha512-fTbfAE7HpXES+vPYzhP0eGljmwykGkbY38LymbMsrn7p6DmvKuJIh4sfUzUtIPW+5kMnCiXAEUhi3+oebQZs0g==
+"@cornerstonejs/ai@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/ai/-/ai-4.17.2.tgz#2844f9f8c1457dc2562567f349eafd14f2e51b09"
+  integrity sha512-/JIK3zQzQlnS4hjLcQWiuBHngPMnTRQCodFcS/hf/0jm9Aiz7tfWMqzYptcgWNV5Ssg6sjpmarBY4DcPdJ2qaw==
   dependencies:
     "@babel/runtime-corejs2" "7.26.10"
     buffer "6.0.3"
-    dcmjs "0.48.0"
+    dcmjs "0.49.4"
     gl-matrix "3.4.3"
     lodash.clonedeep "4.5.0"
     ndarray "1.0.19"
@@ -1996,20 +1996,20 @@
   resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.7.tgz#784394d05d8cf735640e9c3baa206535ee8e0376"
   integrity sha512-qvP4q4JDib7mi9r7LqKOwqz7YZ8gjtDX4ZCezeYf8+eb7MBXCz5uXAMeVF3yz9Axw4XiIMdB/pqXkm8tqCl13w==
 
-"@cornerstonejs/core@4.15.29":
-  version "4.15.29"
-  resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-4.15.29.tgz#498b3dd23119b9b03fbd81d859e029715766f957"
-  integrity sha512-o+5gXbxtZde1GIULmw+hWwf6KI3eiXCre0U1C372jbovxA66JH2t+2VW1nj0F2JRRnO0FjgT/+DWYCWt0ILGoA==
+"@cornerstonejs/core@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-4.17.2.tgz#7be63b58b55370a8b2595dcbbea7d50178da3040"
+  integrity sha512-RjtecSOgS7KGeRdFSZwJ9CGU12iNyriQxwuQxF62G1Lkr1hakFTF9i7vS/t6tWhecLqkuefxfe7+pJaXm3M8vQ==
   dependencies:
     "@kitware/vtk.js" "34.15.1"
     comlink "4.4.2"
     gl-matrix "3.4.3"
     loglevel "1.9.2"
 
-"@cornerstonejs/dicom-image-loader@4.15.29":
-  version "4.15.29"
-  resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-4.15.29.tgz#238cd5cdc4cfd310e0baffb8e9be7895db01dffe"
-  integrity sha512-+R7NoFyVTz2OSKclVQ21dqwgYmFM5q7SZc59YPcxfop7rk2+9H5rRxa04ytKHPjz+N5AlqbLKpJvy/RE10Xcew==
+"@cornerstonejs/dicom-image-loader@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-4.17.2.tgz#818e455a718423b127c5853d5aa93926937ba68c"
+  integrity sha512-I6x3ZLTwYy2nqlbBhFpoSkMQZ+UqIx1PM2/8lJk/mgfoCjb8MoEQ2mPQvJL6xdUIvViEGG2bg5iCmoCzKM3lCg==
   dependencies:
     "@cornerstonejs/codec-charls" "1.2.3"
     "@cornerstonejs/codec-libjpeg-turbo-8bit" "1.2.2"
@@ -2021,25 +2021,25 @@
     pako "2.1.0"
     uuid "9.0.1"
 
-"@cornerstonejs/labelmap-interpolation@4.15.29":
-  version "4.15.29"
-  resolved "https://registry.yarnpkg.com/@cornerstonejs/labelmap-interpolation/-/labelmap-interpolation-4.15.29.tgz#413f8c4d22a5658a32ed658864ce99f34237a413"
-  integrity sha512-4pZTcZWv88l59HDSd/arlJ/WNcdxf9WZbm4GiwsrOZxKx8vkLivnKA+pjPUu1LugCJjlLMgugEVnBhZCk+hW7w==
+"@cornerstonejs/labelmap-interpolation@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/labelmap-interpolation/-/labelmap-interpolation-4.17.2.tgz#87c3d6f0edb6ece320b1f879a76283ecff09e746"
+  integrity sha512-BhkTmxCiMhYn4j+AnasowtOewDq6FYkyB3YzL97Fj4ycfwijY5IyH23SH8Dzopcqysssc6C0AD4+tvIhiMz+xg==
   dependencies:
     "@itk-wasm/morphological-contour-interpolation" "1.1.0"
     itk-wasm "1.0.0-b.165"
 
-"@cornerstonejs/polymorphic-segmentation@4.15.29":
-  version "4.15.29"
-  resolved "https://registry.yarnpkg.com/@cornerstonejs/polymorphic-segmentation/-/polymorphic-segmentation-4.15.29.tgz#f905f976b238f1af9f717f925d5650943f81a55d"
-  integrity sha512-EMCw2Y+bjtI3qfCAv1VbAumWH8XNokEMA1roI03jLzaCvr0+8Jts9Z3P4kyQmOm60veaad9214yM9IZ41J4zGQ==
+"@cornerstonejs/polymorphic-segmentation@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/polymorphic-segmentation/-/polymorphic-segmentation-4.17.2.tgz#b2adb63a3768ed9db8ccba913cbd76fe28530104"
+  integrity sha512-l7db5Gp/mFq6ALv+TxxVF0eb/7tizJpymvN+2vpQBW/Fma8AgZznNQluqRXykgFBAqgkWonvATwH/MihegVv7A==
   dependencies:
     "@icr/polyseg-wasm" "0.4.0"
 
-"@cornerstonejs/tools@4.15.29":
-  version "4.15.29"
-  resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-4.15.29.tgz#46d29b8f01d2cc702a15547b1013d2b6a94cffff"
-  integrity sha512-MG+RPJ8EUyT3tWcHimSoDHOTeodNQAz7vPG+H03BjkbRu2RPsRVQRqSqoWHkyTOgyUv1XTk0JXJTXZQ/I7xcdA==
+"@cornerstonejs/tools@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-4.17.2.tgz#42db5d531e144d1d57161d0efc28ce0a9f03669a"
+  integrity sha512-ms9jO5ZIhaJ0YVZtfQ9uXKrIfc3XLt/WQGz3Wv7inLnAwLziPKvWHqWaMpn58kqwTfjxb7quJsLU+Z+DknqQMg==
   dependencies:
     "@types/offscreencanvas" "2019.7.3"
     comlink "4.4.2"
@@ -8389,7 +8389,7 @@ dayjs@^1.10.4:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
   integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
-dcmjs@0.48.0, dcmjs@0.49.4, dcmjs@^0.41.0:
+dcmjs@0.49.4, dcmjs@^0.41.0:
   version "0.49.4"
   resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.49.4.tgz#833c014eb9e36a6859c80a860b0fb231d9bfeaf8"
   integrity sha512-w77Gde5JvLjg37FyGIAsTB+oWZIqkO/5NvBeheEVKy6k9XjBgeGsoAbVAByjuGAFLpGqRbf9iWI0edBq87yu/g==