diff --git a/Ghidra/Debug/Debugger-rmi-trace/Module.manifest b/Ghidra/Debug/Debugger-rmi-trace/Module.manifest
index 22c6608a4d..e22a93cb5b 100644
--- a/Ghidra/Debug/Debugger-rmi-trace/Module.manifest
+++ b/Ghidra/Debug/Debugger-rmi-trace/Module.manifest
@@ -1,4 +1,4 @@
 MODULE FILE LICENSE: pypkg/dist/protobuf-6.31.0-py3-none-any.whl BSD-3-GOOGLE
 MODULE FILE LICENSE: pypkg/dist/psutil-5.9.8.tar.gz BSD-3-PSUTIL
-MODULE FILE LICENSE: pypkg/dist/setuptools-68.0.0-py3-none-any.whl MIT
-MODULE FILE LICENSE: pypkg/dist/wheel-0.37.1-py2.py3-none-any.whl MIT
+MODULE FILE LICENSE: pypkg/dist/setuptools-80.9.0-py3-none-any.whl MIT
+MODULE FILE LICENSE: pypkg/dist/wheel-0.45.1-py3-none-any.whl MIT
diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle
index 8fda8790eb..9dd8522d88 100644
--- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle
+++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle
@@ -75,5 +75,5 @@ tasks.assemblePyPackage {
 
 distributePyDep("protobuf-6.31.0-py3-none-any.whl")
 distributePyDep("psutil-5.9.8.tar.gz")
-distributePyDep("setuptools-68.0.0-py3-none-any.whl")
-distributePyDep("wheel-0.37.1-py2.py3-none-any.whl")
+distributePyDep("setuptools-80.9.0-py3-none-any.whl")
+distributePyDep("wheel-0.45.1-py3-none-any.whl")
diff --git a/Ghidra/Features/PyGhidra/Module.manifest b/Ghidra/Features/PyGhidra/Module.manifest
index c048c52a90..a666b2e9ce 100644
--- a/Ghidra/Features/PyGhidra/Module.manifest
+++ b/Ghidra/Features/PyGhidra/Module.manifest
@@ -20,6 +20,6 @@ MODULE FILE LICENSE: pypkg/dist/jpype1-1.5.2-cp39-cp39-manylinux_2_17_x86_64.man
 MODULE FILE LICENSE: pypkg/dist/jpype1-1.5.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl Apache License 2.0
 MODULE FILE LICENSE: pypkg/dist/jpype1-1.5.2-cp39-cp39-macosx_10_9_x86_64.whl Apache License 2.0
 MODULE FILE LICENSE: pypkg/dist/jpype1-1.5.2.tar.gz Apache License 2.0
-MODULE FILE LICENSE: pypkg/dist/packaging-23.2-py3-none-any.whl Apache License 2.0
-MODULE FILE LICENSE: pypkg/dist/setuptools-68.0.0-py3-none-any.whl MIT
-MODULE FILE LICENSE: pypkg/dist/wheel-0.37.1-py2.py3-none-any.whl MIT
+MODULE FILE LICENSE: pypkg/dist/packaging-25.0-py3-none-any.whl Apache License 2.0
+MODULE FILE LICENSE: pypkg/dist/setuptools-80.9.0-py3-none-any.whl MIT
+MODULE FILE LICENSE: pypkg/dist/wheel-0.45.1-py3-none-any.whl MIT
diff --git a/Ghidra/Features/PyGhidra/build.gradle b/Ghidra/Features/PyGhidra/build.gradle
index 9017400fc4..4b4fcfde10 100644
--- a/Ghidra/Features/PyGhidra/build.gradle
+++ b/Ghidra/Features/PyGhidra/build.gradle
@@ -55,9 +55,9 @@ distributePyDep("jpype1-1.5.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_
 distributePyDep("jpype1-1.5.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl")
 distributePyDep("jpype1-1.5.2-cp39-cp39-macosx_10_9_x86_64.whl")
 distributePyDep("jpype1-1.5.2.tar.gz")
-distributePyDep("packaging-23.2-py3-none-any.whl")
-distributePyDep("setuptools-68.0.0-py3-none-any.whl")
-distributePyDep("wheel-0.37.1-py2.py3-none-any.whl")
+distributePyDep("packaging-25.0-py3-none-any.whl")
+distributePyDep("setuptools-80.9.0-py3-none-any.whl")
+distributePyDep("wheel-0.45.1-py3-none-any.whl")
 
 // Install JPype into the development virtual environment
 task installJPype(type: Exec) {
diff --git a/Ghidra/Processors/RISCV/data/languages/riscv.opinion b/Ghidra/Processors/RISCV/data/languages/riscv.opinion
index 4f550dedbc..dee07a29d9 100644
--- a/Ghidra/Processors/RISCV/data/languages/riscv.opinion
+++ b/Ghidra/Processors/RISCV/data/languages/riscv.opinion
@@ -11,18 +11,11 @@
       <!-- EF_RISCV_ABI_QUAD          0x0006  -->
       <!-- EF_RISCV_RVE               0x0008  -->
       <!-- EF_RISCV_TSO               0x0010  -->
-      <constraint primary="243" secondary="0" processor="RISCV" endian="little" size="32" variant="RV32I"/>
-      <constraint primary="243" secondary="0" processor="RISCV" endian="little" size="64" variant="RV64I"/>
-      <constraint primary="243" secondary="1" processor="RISCV" endian="little" size="32" variant="RV32IMC"/>
-      <constraint primary="243" secondary="1" processor="RISCV" endian="little" size="64" variant="RV64IC"/>
-      <constraint primary="243" secondary="2" processor="RISCV" endian="little" size="32" variant="RV32IF"/>
-      <constraint primary="243" secondary="3" processor="RISCV" endian="little" size="32" variant="RV32GC"/> <!-- RV32IMAFC -->
-      <constraint primary="243" secondary="4" processor="RISCV" endian="little" size="32" variant="RV32G"/>
-      <constraint primary="243" secondary="4" processor="RISCV" endian="little" size="64" variant="RV64G"/>
-      <constraint primary="243" secondary="5" processor="RISCV" endian="little" size="32" variant="RV32GC"/>
-      <constraint primary="243" secondary="5" processor="RISCV" endian="little" size="64" variant="RV64GC"/>
-      <constraint primary="243" processor="RISCV" endian="little" size="32" variant="RV32GC"/>
-      <constraint primary="243" processor="RISCV" endian="little" size="64" variant="RV64GC"/>
+      
+      <constraint primary="243" processor="RISCV" endian="little" size="32"/> <!-- must choose between 'default' and 'AndeStar' variants -->
+      <constraint primary="243" processor="RISCV" endian="little" size="64" variant="default"/>
+      
     </constraint>
+    
   </constraint>
 </opinions>
diff --git a/gradle/support/fetchDependencies.gradle b/gradle/support/fetchDependencies.gradle
index 3d06360669..fde3c70ded 100644
--- a/gradle/support/fetchDependencies.gradle
+++ b/gradle/support/fetchDependencies.gradle
@@ -224,15 +224,15 @@ ext.deps = [
 		destination: file("${DEPS_DIR}/Debugger-rmi-trace/")
 	],
 	[
-		name: "setuptools-68.0.0-py3-none-any.whl",
-		url: "https://files.pythonhosted.org/packages/c7/42/be1c7bbdd83e1bfb160c94b9cafd8e25efc7400346cf7ccdbdb452c467fa/setuptools-68.0.0-py3-none-any.whl",
-		sha256: "11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f",
+		name: "setuptools-80.9.0-py3-none-any.whl",
+		url: "https://files.pythonhosted.org/packages/a3/dc/17031897dae0efacfea57dfd3a82fdd2a2aeb58e0ff71b77b87e44edc772/setuptools-80.9.0-py3-none-any.whl",
+		sha256: "062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922",
 		destination: [file("${DEPS_DIR}/Debugger-rmi-trace/"), file("${DEPS_DIR}/PyGhidra/")]
 	],
 	[
-		name: "wheel-0.37.1-py2.py3-none-any.whl",
-		url: "https://files.pythonhosted.org/packages/27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any.whl",
-		sha256: "4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a",
+		name: "wheel-0.45.1-py3-none-any.whl",
+		url: "https://files.pythonhosted.org/packages/0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any.whl",
+		sha256: "708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248",
 		destination: [file("${DEPS_DIR}/Debugger-rmi-trace/"), file("${DEPS_DIR}/PyGhidra/")]
 	],
 	[
@@ -308,9 +308,9 @@ ext.deps = [
 		destination: file("${DEPS_DIR}/Debugger-agent-dbgeng/")
 	],
 	[
-		name: "packaging-23.2-py3-none-any.whl",
-		url: "https://files.pythonhosted.org/packages/ec/1a/610693ac4ee14fcdf2d9bf3c493370e4f2ef7ae2e19217d7a237ff42367d/packaging-23.2-py3-none-any.whl",
-		sha256: "8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7",
+		name: "packaging-25.0-py3-none-any.whl",
+		url: "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl",
+		sha256: "29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484",
 		destination: file("${DEPS_DIR}/PyGhidra/")
 	], 
 	[