diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/ClusterMember.java b/aeron-cluster/src/main/java/io/aeron/cluster/ClusterMember.java
index 9002a47b55..391820f710 100644
--- a/aeron-cluster/src/main/java/io/aeron/cluster/ClusterMember.java
+++ b/aeron-cluster/src/main/java/io/aeron/cluster/ClusterMember.java
@@ -566,6 +566,11 @@ public static ClusterMember parseEndpoints(final int id, final String endpointsD
      */
     public static String encodeAsString(final ClusterMember[] clusterMembers)
     {
+        if (0 == clusterMembers.length)
+        {
+            return "";
+        }
+
         final StringBuilder builder = new StringBuilder();
 
         for (int i = 0, length = clusterMembers.length; i < length; i++)
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java b/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java
index 6502b5eeb2..a4c02761b1 100644
--- a/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java
+++ b/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java
@@ -778,9 +778,9 @@ public void onRemoveMember(final long correlationId, final int memberId, final b
         }
     }
 
-    public void onClusterMembersQuery(final long correlationId, final boolean returnExtended)
+    public void onClusterMembersQuery(final long correlationId, final boolean isExtendedRequest)
     {
-        if (returnExtended)
+        if (isExtendedRequest)
         {
             serviceProxy.clusterMembersExtendedResponse(
                 correlationId, timeNs, leaderMember.id(), memberId, clusterMembers, passiveMembers);
diff --git a/version.txt b/version.txt
index d07d97c65b..c38c4af8fc 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.24.1-SNAPSHOT
\ No newline at end of file
+1.25.0-SNAPSHOT
\ No newline at end of file