diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dc91374..3ac9330 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-# Copyright 2020, 2024, Oracle Corporation and/or its affiliates.
+# Copyright 2020, 2025, Oracle Corporation and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # https://oss.oracle.com/licenses/upl.
@@ -84,14 +84,14 @@ jobs:
 
     # Capture logs and test reports for diagnosing failures
     - name: Capture test logs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: build-output
         path: build\**\*.log
 
     - name: Capture test reports
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: test-reports
diff --git a/include/public/coherence/net/cache/ContinuousQueryCache.hpp b/include/public/coherence/net/cache/ContinuousQueryCache.hpp
index fa6448b..cce0d27 100644
--- a/include/public/coherence/net/cache/ContinuousQueryCache.hpp
+++ b/include/public/coherence/net/cache/ContinuousQueryCache.hpp
@@ -72,7 +72,8 @@ class COH_EXPORT ContinuousQueryCache
         * @param vFilter       the Filter that defines the view
         * @param fCacheValues  pass true to cache both the keys and values of
         *                      the materialized view locally, or false to
-        *                      only cache the keys
+        *                      only cache the keys. Override of false described
+        *                      in isCacheValues()
         * @param hListener     an initial MapListener that will receive all
         *                      the events from the ContinuousQueryCache,
         *                      including those corresponding to its initial
@@ -80,6 +81,9 @@ class COH_EXPORT ContinuousQueryCache
         * @param vTransformer  the transformer that should be used to convert
         *                      values from the underlying cache before storing
         *                      them locally
+        * Note: When parameter fCacheValues is false, it is inferred that provided parameter
+        * listener is a lite listener as described by fLite parameter of
+        * addMapListener(MapListener, Filter, boolean).
         */
         ContinuousQueryCache(NamedCache::Handle hCache,
                 Filter::View vFilter, bool fCacheValues = false,
@@ -101,7 +105,8 @@ class COH_EXPORT ContinuousQueryCache
         * @param vFilter         the Filter that defines the view
         * @param fCacheValues    pass true to cache both the keys and values of
         *                        the materialized view locally, or false to
-        *                        only cache the keys
+        *                        only cache the keys. Override of false described
+        *                        in isCacheValues()
         * @param hListener       an initial MapListener that will receive all
         *                        the events from the ContinuousQueryCache,
         *                        including those corresponding to its initial
@@ -109,6 +114,9 @@ class COH_EXPORT ContinuousQueryCache
         * @param vTransformer    the transformer that should be used to convert
         *                        values from the underlying cache before storing
         *                        them locally
+        * Note: When parameter fCacheValues is false, it is inferred that provided parameter
+        * listener is a lite listener as described by fLite parameter of
+        * addMapListener(MapListener, Filter, boolean).
         */
         ContinuousQueryCache(Supplier::View vCacheSupplier,
                 Filter::View vFilter, bool fCacheValues,
@@ -169,6 +177,12 @@ class COH_EXPORT ContinuousQueryCache
         *
         * @return true if this object caches values locally, and false if it
         *        relies on the underlying NamedCache
+        * 
+        * Note: if addMapListener(MapListener, Filter, boolean) adds a standard 
+        * (non-lite) listener or a filter to this ObservableMap, cache values are 
+        * always maintained locally. The locally cached values are used to filter events
+        * and to supply the old and new values for the events that it raises.
+        * Additionally, a non-null transformer infers caches values being stored locally.
         */
         virtual bool isCacheValues() const;
 
@@ -182,7 +196,8 @@ class COH_EXPORT ContinuousQueryCache
         * cached data and rely on the underlying NamedCache.
         *
         * @param fCacheValues pass true to enable local caching, or false to
-        *                     disable it
+        *                     disable it.  Override of false described 
+        *                     in isCacheValues()
         */
         virtual void setCacheValues(bool fCacheValues);
 
diff --git a/prj/apidoc/api.html b/prj/apidoc/api.html
index c1706c6..dda11de 100644
--- a/prj/apidoc/api.html
+++ b/prj/apidoc/api.html
@@ -1,11 +1,11 @@
 <!--
-  Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+  Copyright (c) 2000, 2025, Oracle and/or its affiliates.
 
   Licensed under the Universal Permissive License v 1.0 as shown at
-  http://oss.oracle.com/licenses/upl.
+  https://oss.oracle.com/licenses/upl.
 -->
 <html>
-<head><title>Oracle\u00AE Fusion Middleware C++ API Reference for Oracle Coherence:</title></head>
+<head><title>C++ Client API Reference for Oracle Coherence:</title></head>
 <body onload="onLoad()">
   <script language="JavaScript">
   <!--
diff --git a/prj/apidoc/doxygen.cfg b/prj/apidoc/doxygen.cfg
index 4629af9..908f2e3 100644
--- a/prj/apidoc/doxygen.cfg
+++ b/prj/apidoc/doxygen.cfg
@@ -1,10 +1,10 @@
 # Doxyfile 1.5.2
 
 #
-# Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at
-# http://oss.oracle.com/licenses/upl.
+# https://oss.oracle.com/licenses/upl.
 #
 
 # This file describes the settings to be used by the documentation system
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "Oracle&reg; Fusion Middleware C++ API Reference for Oracle Coherence"
+PROJECT_NAME           = "C++ Client API Reference for Oracle Coherence"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
diff --git a/prj/apidoc/doxygen_private.cfg b/prj/apidoc/doxygen_private.cfg
index 4731fd6..d1b1dfb 100644
--- a/prj/apidoc/doxygen_private.cfg
+++ b/prj/apidoc/doxygen_private.cfg
@@ -1,10 +1,10 @@
 # Doxyfile 1.5.2
 
 #
-# Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at
-# http://oss.oracle.com/licenses/upl.
+# https://oss.oracle.com/licenses/upl.
 #
 
 # This file describes the settings to be used by the documentation system
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "Oracle&reg; Fusion Middleware C++ API Reference for Oracle Coherence"
+PROJECT_NAME           = "C++ Client API Reference for Oracle Coherence"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
diff --git a/prj/build-import.xml b/prj/build-import.xml
index 59a07f8..12cf30b 100644
--- a/prj/build-import.xml
+++ b/prj/build-import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+  Copyright (c) 2000, 2025, Oracle and/or its affiliates.
 
   Licensed under the Universal Permissive License v 1.0 as shown at
   https://oss.oracle.com/licenses/upl.
@@ -47,7 +47,7 @@
     <format property="description.time"   pattern="MMdd.yyyy.hhmm"/>
   </tstamp>
 
-  <property name="build.copyright"      value="Copyright (c) 2000, 2024, Oracle and/or its affiliates."/>
+  <property name="build.copyright"      value="Copyright (c) 2000, 2025, Oracle and/or its affiliates."/>
   <property name="build.description"    value="Internal-${env.HOSTNAME}-${description.time}"/>
   <property name="build.number"         value="0"/>
   <property name="build.type"           value="debug"/>
diff --git a/prj/build.properties b/prj/build.properties
index d48e85b..349853c 100644
--- a/prj/build.properties
+++ b/prj/build.properties
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+#  Copyright (c) 2000, 2025, Oracle and/or its affiliates.
 #
 #  Licensed under the Universal Permissive License v 1.0 as shown at
 #  https://oss.oracle.com/licenses/upl.
@@ -12,6 +12,8 @@
 
 build.description=
 build.type=debug
-build.version=14.1.2.0.0
+build.version=14.1.2.0.4
+
+# Set the version of latest Coherence CE version (server/java) to test with
 build.groupId_maven=com.oracle.coherence.ce
-build.version_maven=22.06.8
+build.version_maven=14.1.2-0-3
diff --git a/src/coherence/net/AddressProvider.cpp b/src/coherence/net/AddressProvider.cpp
new file mode 100644
index 0000000..ca3cda8
--- /dev/null
+++ b/src/coherence/net/AddressProvider.cpp
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * https://oss.oracle.com/licenses/upl.
+ */
+#include "coherence/net/AddressProvider.hpp"
+
+COH_OPEN_NAMESPACE2(coherence,net)
+
+// ----- ClassLoader registration -------------------------------------------
+
+COH_REGISTER_CLASS(TypedBarrenClass<AddressProvider>::create());
+
+COH_CLOSE_NAMESPACE2
diff --git a/src/coherence/net/cache/ContinuousQueryCache.cpp b/src/coherence/net/cache/ContinuousQueryCache.cpp
index 072dcb8..5e4bdc5 100644
--- a/src/coherence/net/cache/ContinuousQueryCache.cpp
+++ b/src/coherence/net/cache/ContinuousQueryCache.cpp
@@ -248,7 +248,8 @@ MapListener::View ContinuousQueryCache::getMapListener() const
 
 bool ContinuousQueryCache::isCacheValues() const
     {
-    return m_fCacheValues || isObserved();
+     // standard listener or non-null transformer override initial fCacheValue 
+    return m_fCacheValues || isObserved() || f_vTransformer != NULL;          
     }
 
 void ContinuousQueryCache::setCacheValues(bool fCacheValues)
@@ -332,11 +333,13 @@ ObservableMap::Handle ContinuousQueryCache::ensureInternalCache() const
     if (hMapLocal == NULL)
         {
         hMapLocal = m_hMapLocal = instantiateInternalCache();
-        if (m_fListeners)
+
+        MapListener::Handle hListener = m_hListener;
+        bool                fLite     = !isCacheValues();
+        if (hListener != NULL)
             {
-            MapListener::Handle hListener = m_hListener;
             ensureEventQueue();
-            hMapLocal->addFilterListener(instantiateEventRouter(m_hListener, false));
+            hMapLocal->addFilterListener(instantiateEventRouter(hListener, fLite), NULL, fLite);
             }
         }
     return hMapLocal;
@@ -1584,8 +1587,8 @@ void ContinuousQueryCache::onInit()
     initialize(f_hSetKeys, instantiateKeySet());
     initialize(f_hSetEntries, instantiateEntrySet());
 
-    // was a listener passed at construction time?
-    m_fListeners = m_hListener != NULL;
+    // was a standard (non-lite) listener passed at construction time?
+    m_fListeners = m_hListener != NULL && isCacheValues();
 
     ensureInternalCache();
     ensureSynchronized(false);
diff --git a/tests/functional/coherence/net/cache/CQCProxyTest.hpp b/tests/functional/coherence/net/cache/CQCProxyTest.hpp
index a636c15..6aa6a1c 100644
--- a/tests/functional/coherence/net/cache/CQCProxyTest.hpp
+++ b/tests/functional/coherence/net/cache/CQCProxyTest.hpp
@@ -213,7 +213,7 @@ class CQCProxyTest : public CxxTest::TestSuite
 
             // instantiate the CQC, will start the test running.
             ContinuousQueryCache::Handle hCQC =
-                    ContinuousQueryCache::create(hTestCache, AlwaysFilter::create(), false, hListener);
+                    ContinuousQueryCache::create(hTestCache, AlwaysFilter::create(), true, hListener);
 
             // add member listener to inner cache to receive memberLeft
             // event; intermittently, the "get" which restarts the
diff --git a/tests/functional/coherence/net/cache/ContinuousQueryCacheTest.hpp b/tests/functional/coherence/net/cache/ContinuousQueryCacheTest.hpp
index d2280b4..4cc7c09 100644
--- a/tests/functional/coherence/net/cache/ContinuousQueryCacheTest.hpp
+++ b/tests/functional/coherence/net/cache/ContinuousQueryCacheTest.hpp
@@ -122,6 +122,44 @@ class ContinuousQueryCacheTest : public CxxTest::TestSuite
                 }
         };
 
+    // validating lite cache listener for CQC instance
+    class ValidateLiteMapListener : public class_spec<ValidateLiteMapListener,
+            extends<Object>, implements<MapListener> >
+        {
+        friend class factory<ValidateLiteMapListener>;
+
+        protected:
+            ValidateLiteMapListener(bool fLite)
+                {
+                m_fLite = fLite;    
+                }
+
+        public:
+            void entryInserted(MapEvent::View vEvt)
+                {
+                TS_ASSERT(m_fLite ? vEvt->getNewValue() == NULL : vEvt->getNewValue() != NULL);
+                }
+
+            void entryUpdated(MapEvent::View vEvt)
+                {
+                TS_ASSERT(m_fLite ? vEvt->getNewValue() == NULL : vEvt->getNewValue() != NULL);
+                TS_ASSERT(m_fLite ? vEvt->getOldValue() == NULL : vEvt->getOldValue() != NULL);
+                }
+
+            void entryDeleted(MapEvent::View vEvt)
+                {
+                TS_ASSERT(m_fLite ? vEvt->getOldValue() == NULL : vEvt->getOldValue() != NULL);    
+                }
+
+         // ----- data members -----------------------------------------------
+
+        protected:
+          /**
+            * If true, validate a lite MapListener, get old and new value are NULL.
+            */
+            bool m_fLite;    
+        };    
+
     // ----- local class: TestCQCListener -----------------------------------
 
     /**
@@ -510,7 +548,7 @@ class ContinuousQueryCacheTest : public CxxTest::TestSuite
 
             // create CQC
             ContinuousQueryCache::Handle hCqc = ContinuousQueryCache::create(
-                  hCache, AlwaysFilter::create(), false, hMockListener);
+                  hCache, AlwaysFilter::create(), true, hMockListener);
 
             Object::View vKey   = String::create("key1");
             Object::View vVal   = String::create("val1");
@@ -1891,6 +1929,49 @@ class ContinuousQueryCacheTest : public CxxTest::TestSuite
             hCqc->release();
             }
 
+        /*
+        * Test for COH-31325 
+        */
+        void testCOH31325()
+            {                        
+            NamedCache::Handle hCache = ensureCleanCache("TestCache");
+
+            // test fCacheValues of false and lite map listener
+            ContinuousQueryCache::Handle hCqc = ContinuousQueryCache::create(
+                hCache, AlwaysFilter::create(), false, ValidateLiteMapListener::create(true));
+            TS_ASSERT(!hCqc->isCacheValues());
+            hCache->put(String::create("Key31325"), String::create("Value31325"));
+            hCache->put(String::create("Key31325"), String::create("UpdateValue31325"));
+            hCache->remove(String::create("Key31325"));
+            TS_ASSERT(!hCqc->isCacheValues());
+            hCqc->release();
+
+            // test fCacheValues of false initially with map listener, first non-lite listener converts isCacheValues to true
+            hCqc = ContinuousQueryCache::create(
+                hCache, AlwaysFilter::create(), false, SampleMapListener::create());
+            TS_ASSERT(!hCqc->isCacheValues());
+            hCache->put(String::create("Key31325"), String::create("Value31325"));
+            hCache->put(String::create("Key31325"), String::create("UpdateValue31325"));
+            hCache->remove(String::create("Key31325"));
+            TS_ASSERT(!hCqc->isCacheValues());
+            // add a standard listener and verify isCacheValues after
+            hCqc->addFilterListener(ValidateLiteMapListener::create(false), AlwaysFilter::create(), false);
+            hCache->put(String::create("Key31325"), String::create("SecondUpdateValue31325"));
+            TS_ASSERT(hCqc->isCacheValues());
+            hCqc->release();
+
+            // validate standard listener when fCacheValues is true
+            hCache = ensureCleanCache("TestCache");
+            hCqc = ContinuousQueryCache::create(
+                hCache, AlwaysFilter::create(), true, ValidateLiteMapListener::create(false));
+            TS_ASSERT(hCqc->isCacheValues());
+            hCache->put(String::create("Key31325"), String::create("Value31325"));
+            hCache->put(String::create("Key31325"), String::create("UpdateValue31325"));
+            hCache->remove(String::create("Key31325"));
+            TS_ASSERT(hCqc->isCacheValues());
+            hCqc->release();
+            }
+
         /*
         * Test for COH-10013
         */
diff --git a/tests/unit/coherence/net/ViewBuilderTest.hpp b/tests/unit/coherence/net/ViewBuilderTest.hpp
index f36308f..6418acc 100644
--- a/tests/unit/coherence/net/ViewBuilderTest.hpp
+++ b/tests/unit/coherence/net/ViewBuilderTest.hpp
@@ -154,6 +154,12 @@ class ViewBuilderTest : public CxxTest::TestSuite
             hCache->entrySet((Filter::View) NULL);
             hCache->lastExpectation()->ignoreArguments();
             hCache->setObjectReturn(HashSet::create());
+            hCache->invokeAll((Filter::View) NULL, (InvocableMap::EntryProcessor::Handle) NULL);
+            hCache->lastExpectation()->ignoreArguments();
+            hCache->setObjectReturn(HashMap::create());
+            hCache->getAll((Collection::View) NULL);                        
+            hCache->lastExpectation()->ignoreArguments();
+            hCache->setObjectReturn(HashSet::create());
 
             //replay
             hCache->replay();
diff --git a/tests/unit/coherence/net/cache/ContinuousQueryCacheTest.hpp b/tests/unit/coherence/net/cache/ContinuousQueryCacheTest.hpp
index cbff029..a155224 100644
--- a/tests/unit/coherence/net/cache/ContinuousQueryCacheTest.hpp
+++ b/tests/unit/coherence/net/cache/ContinuousQueryCacheTest.hpp
@@ -96,6 +96,40 @@ class ContinuousQueryCacheTest : public CxxTest::TestSuite
         TS_ASSERT(hCqc->isCacheValues());
         }
 
+        void testIsCacheValuesWithListener()
+            {
+            MockNamedCache::Handle hMockNamedCache = MockNamedCache::create();
+            MockMapListener::Handle hMockListener = MockMapListener::create();
+            Filter::Handle hFilter = DummyFilter::create();
+
+            //set expectations
+            hMockNamedCache->entrySet(hFilter);
+            hMockNamedCache->setMatcher(&matchAll);
+            hMockNamedCache->setObjectReturn(Collections::emptySet());
+
+            hMockNamedCache->keySet(hFilter);
+            hMockNamedCache->setMatcher(&matchAll);
+            hMockNamedCache->setObjectReturn(Collections::emptySet());
+
+            hMockNamedCache->entrySet(hFilter);
+            hMockNamedCache->setMatcher(&matchAll);
+            hMockNamedCache->setObjectReturn(Collections::emptySet());
+
+            hMockNamedCache->keySet(hFilter);
+            hMockNamedCache->setMatcher(&matchAll);
+            hMockNamedCache->setObjectReturn(Collections::emptySet());
+
+            //replay
+            hMockNamedCache->replay();
+
+            ContinuousQueryCache::Handle hCqc = ContinuousQueryCache::create(hMockNamedCache, hFilter, false, hMockListener);
+            TS_ASSERT(!hCqc->isCacheValues());
+
+            hCqc = ContinuousQueryCache::create(hMockNamedCache, hFilter, true, hMockListener);
+            TS_ASSERT(hCqc->isCacheValues());
+            }
+    
+
 
     void testSetCacheValues()
         {