diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 629ef6cb..50bcb64d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build
 
 on:
   push:
-    branches: [ 'sustaining/1.8.x','master' ]
+    branches: [ 'sustaining/1.8.x','master', 'issues/**', 'features/**' ]
   pull_request:
 jobs:
   build-maven:
diff --git a/OpenICF-java-framework/connector-framework-internal/pom.xml b/OpenICF-java-framework/connector-framework-internal/pom.xml
index 02d09025..202cb0b4 100644
--- a/OpenICF-java-framework/connector-framework-internal/pom.xml
+++ b/OpenICF-java-framework/connector-framework-internal/pom.xml
@@ -21,6 +21,8 @@
  with the fields enclosed by brackets [] replaced by
  your own identifying information:
  "Portions Copyrighted [year] [name of copyright owner]"
+
+ Portions Copyrighted 2024-2026 3A Systems LLC.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -36,22 +38,6 @@
         The IdentityConnectors framework provides a container to separate the Connector bundle from the application.
         The framework provides many common features that developers would otherwise need to implement on their own.
     </description>
-    <profiles>
-        <profile>
-            <id>jdk17.options</id>
-            <activation>
-                <jdk>[17,)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.openjdk.nashorn</groupId>
-                    <artifactId>nashorn-core</artifactId>
-                    <version>15.4</version>
-                    <optional>true</optional>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 
     <dependencies>
         <dependency>
@@ -76,6 +62,14 @@
             <!-- @see: org/identityconnectors/framework/impl/test/TestHelpersImpl.java -->
         </dependency>
 
+        <!--Optional dependencies-->
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
+            <version>1.7.15_1</version>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
diff --git a/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/common/script/javascript/JavaScriptExecutorFactory.java b/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/common/script/javascript/JavaScriptExecutorFactory.java
index 4064ef97..df61fac1 100644
--- a/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/common/script/javascript/JavaScriptExecutorFactory.java
+++ b/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/common/script/javascript/JavaScriptExecutorFactory.java
@@ -20,6 +20,8 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Portions Copyrighted 2024-2026 3A Systems LLC.
  */
 
 package org.identityconnectors.common.script.javascript;
@@ -55,6 +57,10 @@ public class JavaScriptExecutorFactory extends ScriptExecutorFactory {
      */
     public JavaScriptExecutorFactory() {
         ScriptEngine engine = manager.getEngineByName(JAVA_SCRIPT);
+        if(engine == null) {
+            manager.registerEngineName(JAVA_SCRIPT, new org.mozilla.javascript.engine.RhinoScriptEngineFactory());
+            engine = manager.getEngineByName(JAVA_SCRIPT);
+        }
         if (null == engine) {
             throw new IllegalStateException("JavaScript Engine is not found");
         }
diff --git a/pom.xml b/pom.xml
index 00b3e2e2..c214fde6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,7 @@
             <dependency>
                 <groupId>org.openidentityplatform.opendj</groupId>
                 <artifactId>opendj-parent</artifactId>
-                <version>5.0.4</version>
+                <version>5.1.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>