diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 486a2325..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.zip filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index c777b1fd..f17e864e 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -24,9 +24,7 @@ The `publish-cws-image` job is the CD component of the workflow, triggered upon
   - MariaDB
     - Image: mariadb:10.3
     - Ports: 3306:3306
-- [**checkout**](https://github.com/marketplace/actions/checkout):
-  - This action checks out the repository under `$GITHUB_WORKSPACE`, so the workflow can access it.
-  - `lfs` is set to `true`, enabling the download of Git-LFS files. Starting with Camunda 7.16, this is required because the Camunda Platform with Tomcat distribution bundled with CWS exceeds GitHub's file size limit of 100 MB.
+- [**checkout**](https://github.com/marketplace/actions/checkout): This action checks out the repository under `$GITHUB_WORKSPACE`, so the workflow can access it.
 - Set up JDK 8:
   - [**setup-java**](https://github.com/marketplace/actions/setup-java-jdk): This action downloads and sets up a requested version of Java
   - Current configuration:
diff --git a/.github/workflows/camunda.yml b/.github/workflows/camunda.yml
index 823ab6f8..31ab490a 100644
--- a/.github/workflows/camunda.yml
+++ b/.github/workflows/camunda.yml
@@ -32,8 +32,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
 
       - name: Set up JDK 8
         uses: actions/setup-java@v3
@@ -80,7 +78,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.52/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.58/logs
           ls -al
 
       - name: Set up Google Chrome
@@ -157,8 +155,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
 
       - name: Set up JDK 8
         uses: actions/setup-java@v3
@@ -205,7 +201,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.52/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.58/logs
           ls -al
 
       - name: Set up Google Chrome
diff --git a/.github/workflows/ldap.yml b/.github/workflows/ldap.yml
index e4825c93..b20d6f7e 100644
--- a/.github/workflows/ldap.yml
+++ b/.github/workflows/ldap.yml
@@ -32,8 +32,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
 
       - name: Set up JDK 8
         uses: actions/setup-java@v3
@@ -85,7 +83,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.52/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.58/logs
           ls -al
 
       - name: Set up Google Chrome
diff --git a/create_server_dist.sh b/create_server_dist.sh
index c0760c18..823a436c 100755
--- a/create_server_dist.sh
+++ b/create_server_dist.sh
@@ -23,6 +23,7 @@ mkdir -p ${CWS}/{bpmn,config/templates,installer,logs,sql/cws}
 
 print 'Unzipping Camunda into distribution...'
 unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}.zip -x start-camunda.bat start-camunda.sh -d ${CWS} > ${CWS}/logs/camunda_extract.log 2>&1
+unzip ${INSTALL_DIR}/cws_camunda-bpm-tomcat-${CAMUNDA_VER}-lib.zip -d ${CWS}/lib > ${CWS}/logs/camunda_extract.log 2>&1
 
 if [[ $? -gt 0 ]]; then
     print "ERROR: failed to unzip Camunda distribution, check ${CWS}/logs/camunda_extract.log for details."
diff --git a/cws-adaptation-engine/pom.xml b/cws-adaptation-engine/pom.xml
index ac5f7eb1..38d772a9 100644
--- a/cws-adaptation-engine/pom.xml
+++ b/cws-adaptation-engine/pom.xml
@@ -26,7 +26,7 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>org.camunda.bpm.assert</groupId>
+			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-bpm-assert</artifactId>
 			<exclusions>
 				<exclusion>
diff --git a/cws-core/pom.xml b/cws-core/pom.xml
index cabe70b2..8a6c2f9c 100644
--- a/cws-core/pom.xml
+++ b/cws-core/pom.xml
@@ -100,7 +100,7 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>org.camunda.bpm.assert</groupId>
+			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-bpm-assert</artifactId>
 			<exclusions>
 				<exclusion>
diff --git a/cws-engine-service/pom.xml b/cws-engine-service/pom.xml
index f03510ff..f2cc972b 100644
--- a/cws-engine-service/pom.xml
+++ b/cws-engine-service/pom.xml
@@ -77,7 +77,7 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>org.camunda.bpm.assert</groupId>
+			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-bpm-assert</artifactId>
 			<exclusions>
 				<exclusion>
diff --git a/cws-service/pom.xml b/cws-service/pom.xml
index 0414f03a..dd16f72f 100644
--- a/cws-service/pom.xml
+++ b/cws-service/pom.xml
@@ -71,7 +71,7 @@
 				</dependency>
 
 				<dependency> <!-- FOR TESTING -->
-					<groupId>org.camunda.bpm.assert</groupId>
+					<groupId>org.camunda.bpm</groupId>
 					<artifactId>camunda-bpm-assert</artifactId>
 					<exclusions>
 						<exclusion>
diff --git a/cws-test/pom.xml b/cws-test/pom.xml
index f883cc01..a2d427b5 100644
--- a/cws-test/pom.xml
+++ b/cws-test/pom.xml
@@ -91,7 +91,7 @@
 		</dependency>
 		
 		<dependency>
-            <groupId>org.camunda.bpm.assert</groupId>
+            <groupId>org.camunda.bpm</groupId>
             <artifactId>camunda-bpm-assert</artifactId>
 			<exclusions>
 				<exclusion>
diff --git a/install/camunda_mods/admin/config.js b/install/camunda_mods/admin/config.js
index cae401af..6c4bc04e 100644
--- a/install/camunda_mods/admin/config.js
+++ b/install/camunda_mods/admin/config.js
@@ -35,7 +35,7 @@ export default {
         // http://requirejs.org/docs/api.html#config
         deps: ['jquery', 'cws'],
         paths: {
-            // if you have a folder called `custom-ui` (in the `cockpit` folder)
+            // if you have a folder called `custom-ui` (in the `admin` folder)
             // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
             'cws': 'cws/scripts'
         }
@@ -49,6 +49,7 @@ export default {
     //     'unit': 'day'
     //   }
     // },
+    'alwaysShowUniqueTaskWorkerMetrics': true,
     // 'locales': {
     //   'availableLocales': ['en', 'de'],
     //   'fallbackLocale': 'en'
diff --git a/install/camunda_mods/admin/index.html b/install/camunda_mods/admin/index.html
index 6378d685..28110fdc 100644
--- a/install/camunda_mods/admin/index.html
+++ b/install/camunda_mods/admin/index.html
@@ -32,11 +32,11 @@
 
 
     <!-- styles -->
-    <link href="$APP_ROOT/app/admin/styles/styles.css?bust=7.16.0"
+    <link href="$APP_ROOT/app/admin/styles/styles.css?bust=7.17.0"
           rel="stylesheet" />
     <link rel="stylesheet"
           type="text/css"
-          href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.16.0">
+          href="$APP_ROOT/app/admin/styles/user-styles.css?bust=7.17.0">
 
     <!-- favicon -->
     <link rel="shortcut icon"
@@ -130,7 +130,7 @@
 
     <!-- footer -->
     <footer cam-widget-footer
-            version="v7.16.0"></footer>
+            version="v7.17.0"></footer>
 
     <script type="application/javascript">
       var adminConf = window.camAdminConf = {};
@@ -156,11 +156,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.16.0';
+window.bust = '7.17.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/admin',
-  urlArgs: 'bust=7.16.0'
+  urlArgs: 'bust=7.17.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/admin/camunda-admin-bootstrap.js'], function () {});
diff --git a/install/camunda_mods/cockpit/index.html b/install/camunda_mods/cockpit/index.html
index fd1498e7..3c931846 100644
--- a/install/camunda_mods/cockpit/index.html
+++ b/install/camunda_mods/cockpit/index.html
@@ -33,13 +33,13 @@
 
 
     <!-- styles -->
-    <link href="$APP_ROOT/app/cockpit/styles/styles.css?bust=7.16.0"
+    <link href="$APP_ROOT/app/cockpit/styles/styles.css?bust=7.17.0"
           rel="stylesheet" />
-    <link href="$APP_ROOT/app/cockpit/styles/styles-components.css?bust=7.16.0"
+    <link href="$APP_ROOT/app/cockpit/styles/styles-components.css?bust=7.17.0"
           rel="stylesheet" />
     <link rel="stylesheet"
           type="text/css"
-          href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.16.0">
+          href="$APP_ROOT/app/cockpit/styles/user-styles.css?bust=7.17.0">
 
     <!-- favicon -->
     <link rel="shortcut icon"
@@ -133,7 +133,7 @@
 
     <!-- footer -->
     <footer cam-widget-footer
-            version="v7.16.0"></footer>
+            version="v7.17.0"></footer>
 
     <script type="application/javascript">
       var cockpitConf = window.camCockpitConf = {};
@@ -159,11 +159,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.16.0';
+window.bust = '7.17.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/cockpit',
-  urlArgs: 'bust=7.16.0'
+  urlArgs: 'bust=7.17.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/cockpit/camunda-cockpit-bootstrap.js'], function(){});
diff --git a/install/camunda_mods/tasklist/config.js b/install/camunda_mods/tasklist/config.js
index bbee1f83..3634d0a4 100644
--- a/install/camunda_mods/tasklist/config.js
+++ b/install/camunda_mods/tasklist/config.js
@@ -44,7 +44,7 @@ export default {
         // http://requirejs.org/docs/api.html#config
         deps: ['jquery', 'cws'],
         paths: {
-            // if you have a folder called `custom-ui` (in the `cockpit` folder)
+            // if you have a folder called `custom-ui` (in the `scripts` folder)
             // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
             'cws': 'cws/scripts'
         }
diff --git a/install/camunda_mods/tasklist/index.html b/install/camunda_mods/tasklist/index.html
index 0e4077ef..aaf6fe9d 100644
--- a/install/camunda_mods/tasklist/index.html
+++ b/install/camunda_mods/tasklist/index.html
@@ -25,10 +25,10 @@
 
   <link rel="stylesheet"
         type="text/css"
-        href="$APP_ROOT/app/tasklist/styles/styles.css?bust=7.16.0">
+        href="$APP_ROOT/app/tasklist/styles/styles.css?bust=7.17.0">
   <link rel="stylesheet"
         type="text/css"
-        href="$APP_ROOT/app/tasklist/styles/user-styles.css?bust=7.16.0">
+        href="$APP_ROOT/app/tasklist/styles/user-styles.css?bust=7.17.0">
 
   <!-- favicon -->
   <link rel="shortcut icon"
@@ -108,7 +108,7 @@
 
   <!-- # page-footer -->
   <footer cam-widget-footer
-          version="v7.16.0"></footer>
+          version="v7.17.0"></footer>
 
 
   <script type="text/javascript">
@@ -142,11 +142,11 @@
 window.__require = window.require;
 window.define = undefined;
 window.require = undefined;
-window.bust = '7.16.0';
+window.bust = '7.17.0';
 
 requirejs.config({
   baseUrl: '$APP_ROOT/app/tasklist',
-  urlArgs: 'bust=7.16.0'
+  urlArgs: 'bust=7.17.0'
 });
 requirejs(['$APP_ROOT/lib/deps.js'], function () {
   requirejs(['$APP_ROOT/app/tasklist/camunda-tasklist-bootstrap.js'], function () {});
diff --git a/install/camunda_mods/web.xml b/install/camunda_mods/web.xml
index e74ada72..58bcefcd 100644
--- a/install/camunda_mods/web.xml
+++ b/install/camunda_mods/web.xml
@@ -109,6 +109,20 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
+  <!-- Session Cookie filter -->
+  <filter>
+    <filter-name>SessionCookieFilter</filter-name>
+    <filter-class>org.camunda.bpm.webapp.impl.security.filter.SessionCookieFilter</filter-class>
+    <!--<init-param>-->
+    <!--<param-name>enableSecureCookie</param-name>-->
+    <!--<param-value>true</param-value>-->
+    <!--</init-param>-->
+  </filter>
+  <filter-mapping>
+    <filter-name>SessionCookieFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
   <!-- HTTP Header Security Filter -->
   <filter>
     <filter-name>HttpHeaderSecurity</filter-name>
diff --git a/install/camunda_mods/welcome/config.js b/install/camunda_mods/welcome/config.js
index c7bc7c5c..bf138640 100644
--- a/install/camunda_mods/welcome/config.js
+++ b/install/camunda_mods/welcome/config.js
@@ -32,7 +32,7 @@ export default {
         // http://requirejs.org/docs/api.html#config
         deps: ['jquery', 'cws'],
         paths: {
-            // if you have a folder called `custom-ui` (in the `cockpit` folder)
+            // if you have a folder called `custom-ui` (in the `scripts` folder)
             // with a file called `scripts.js` in it and defining the `custom-ui` AMD module
             'cws': 'cws/scripts'
         }
diff --git a/install/cws-ui/documentation.ftl b/install/cws-ui/documentation.ftl
index e021a396..2ab91506 100644
--- a/install/cws-ui/documentation.ftl
+++ b/install/cws-ui/documentation.ftl
@@ -74,7 +74,7 @@
 						<td><a href="https://github.com/NASA-AMMOS/common-workflow-service/wiki" target="_blank">CWS Wiki</a></td>
 					</tr>
 					<tr>
-						<td><a href="https://docs.camunda.org/manual/7.16/reference/bpmn20/" target="_blank">Camunda BPMN 2.0 Implementation Reference</a></td>
+						<td><a href="https://docs.camunda.org/manual/7.17/reference/bpmn20/" target="_blank">Camunda BPMN 2.0 Implementation Reference</a></td>
 					</tr>
 					<tr>
 						<td><a href="http://www.bpmnquickguide.com/quickguide/index.html" target="_blank">BP Incubator BPMN Quick Guide</a></td>
diff --git a/install/cws-ui/snippets.ftl b/install/cws-ui/snippets.ftl
index a1c8570f..e339df50 100644
--- a/install/cws-ui/snippets.ftl
+++ b/install/cws-ui/snippets.ftl
@@ -62,7 +62,7 @@
 					<br/>
 					<b>NOTE:</b> <b>For each external code library (JAR)</b> (referenced by Java import statements) <b>put the JAR in the following place</b>:
 					<ul>
-						<li>CWS Console Server: <pre>cws/server/apache-tomcat-9.0.52/lib</pre></li>
+						<li>CWS Console Server: <pre>cws/server/apache-tomcat-9.0.58/lib</pre></li>
 					</ul>
 					<br/>
 				</form>
diff --git a/install/cws_camunda-bpm-tomcat-7.16.0.zip b/install/cws_camunda-bpm-tomcat-7.16.0.zip
deleted file mode 100644
index beef8605..00000000
--- a/install/cws_camunda-bpm-tomcat-7.16.0.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e138d6676217357a63a3cf342ef718e7d68037781a350f912f87fa2e9da2e65
-size 124344133
diff --git a/install/cws_camunda-bpm-tomcat-7.17.0-lib.zip b/install/cws_camunda-bpm-tomcat-7.17.0-lib.zip
new file mode 100644
index 00000000..f531964b
Binary files /dev/null and b/install/cws_camunda-bpm-tomcat-7.17.0-lib.zip differ
diff --git a/install/cws_camunda-bpm-tomcat-7.17.0.zip b/install/cws_camunda-bpm-tomcat-7.17.0.zip
new file mode 100644
index 00000000..98b0e3fe
Binary files /dev/null and b/install/cws_camunda-bpm-tomcat-7.17.0.zip differ
diff --git a/install/docker/console-db-es-ls-kibana/docker-compose.yml b/install/docker/console-db-es-ls-kibana/docker-compose.yml
index ee6b7aee..3a405b7b 100644
--- a/install/docker/console-db-es-ls-kibana/docker-compose.yml
+++ b/install/docker/console-db-es-ls-kibana/docker-compose.yml
@@ -121,7 +121,7 @@ services:
       retries: 12
     volumes:
       - ./config.properties:/home/cws_user/config.properties:ro
-      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.52/logs
+      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.58/logs
   cws-worker:
     container_name: cws-worker1
     labels:
@@ -145,7 +145,7 @@ services:
       - ES_PORT=9200
     volumes:
       - ./worker-config.properties:/home/cws_user/config.properties:ro
-      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.52/logs
+      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.58/logs
 
 volumes:
   logs-volume:
diff --git a/install/docker/cws-image/startup.sh b/install/docker/cws-image/startup.sh
index fb45ded0..41fc24c5 100755
--- a/install/docker/cws-image/startup.sh
+++ b/install/docker/cws-image/startup.sh
@@ -3,10 +3,10 @@
 javac -cp joda-time-2.1.jar getTime.java
 java -cp .:joda-time-2.1.jar getTime
 
-ls /home/cws_user/cws/server/apache-tomcat-9.0.52/logs
+ls /home/cws_user/cws/server/apache-tomcat-9.0.58/logs
 
 # Clear out any previous logs before starting (Note: Previous logs will cause CWS not to start)
-rm -rf /home/cws_user/cws/server/apache-tomcat-9.0.52/logs/*
+rm -rf /home/cws_user/cws/server/apache-tomcat-9.0.58/logs/*
 
 cd cws
 ./configure.sh ../config.properties Y
diff --git a/install/docker/worker-ls/docker-compose.yml b/install/docker/worker-ls/docker-compose.yml
index a394b6f9..ca358050 100644
--- a/install/docker/worker-ls/docker-compose.yml
+++ b/install/docker/worker-ls/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       - ES_PORT=9200
     volumes:
       - ./config.properties:/home/cws_user/config.properties:ro
-      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.52/logs
+      - logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.58/logs
 
 volumes:
   logs-volume:
diff --git a/pom.xml b/pom.xml
index c204dff6..f176e901 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 		<activeio-core.version>3.1.4</activeio-core.version>
 		<software.amazon.awssdk.version>2.16.93</software.amazon.awssdk.version>
 		<!-- <boon.version>0.12</boon.version> -->
-		<camunda.version>7.16.0</camunda.version>
+		<camunda.version>7.17.0</camunda.version>
 		<camunda-spin.version>1.9.0</camunda-spin.version>
 		<commons-compress.version>1.20</commons-compress.version>
 		<commons-configuration.version>1.10</commons-configuration.version>
@@ -45,7 +45,7 @@
 		<fst.version>1.55</fst.version> <!--  USE 1.35 for Java6, 1.55 for Java7 -->
 		<grizzly-http-server.version>2.3.11</grizzly-http-server.version>
 		<!-- <groovy.version>2.4.5</groovy.version> -->
-		<gson.version>2.8.5</gson.version>
+		<gson.version>2.8.9</gson.version>
 		<h2.version>1.2.132</h2.version>
 		<!-- <httpclient.version>4.3</httpclient.version> -->
 		<jacoco.version>0.8.2</jacoco.version>
@@ -65,7 +65,7 @@
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-		<mockito.version>1.9.5</mockito.version>
+		<mockito.version>4.3.1</mockito.version>
 		<mybatis.version>3.5.3</mybatis.version>
 		<mysql-connector.version>8.0.16</mysql-connector.version>
 		<hikaricp.version>4.0.3</hikaricp.version>
@@ -80,7 +80,7 @@
 		<skip.integration.tests>false</skip.integration.tests>
 		<spring.framework.version>4.3.23.RELEASE</spring.framework.version>
 		<surefire.version>2.22.2</surefire.version>
-		<tomcat-catalina.version>9.0.52</tomcat-catalina.version>
+		<tomcat-catalina.version>9.0.58</tomcat-catalina.version>
 		<urlrewritefilter.version>4.0.3</urlrewritefilter.version>
 		<xbean-spring.version>3.17</xbean-spring.version>
 		<xmlunit.version>2.6.2</xmlunit.version>
@@ -510,9 +510,9 @@
 				<scope>test</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.camunda.bpm.assert</groupId>
+				<groupId>org.camunda.bpm</groupId>
 				<artifactId>camunda-bpm-assert</artifactId>
-				<version>15.0.0</version> <!-- for Camunda 7.16 w/ AssertJ 3.21.0 -->
+				<version>${camunda.version}</version>
 				<scope>test</scope>
 				<!--<exclusions>-->
 					<!--<exclusion>-->
@@ -524,7 +524,7 @@
 			<dependency>
 				<groupId>org.assertj</groupId>
 				<artifactId>assertj-core</artifactId>
-				<version>3.21.0</version> <!-- for Camunda 7.16 w/ Camunda BPM Assert 15.0.0 -->
+				<version>3.21.0</version> <!-- for Camunda 7.17 -->
 				<scope>test</scope>
 			</dependency>
 
diff --git a/utils.sh b/utils.sh
index e658f806..ce14af49 100644
--- a/utils.sh
+++ b/utils.sh
@@ -6,8 +6,8 @@
 
 # Update versions as necessary
 export CWS_VER='2.4.0pre.1'    # update this each CWS release
-export CAMUNDA_VER='7.16.0'
-export TOMCAT_VER='9.0.52'
+export CAMUNDA_VER='7.17.0'
+export TOMCAT_VER='9.0.58'
 export LOGSTASH_VER='7.16.2'
 
 # Prints the provided string, tagging with the script that called it