diff --git a/config/dev/log4j2.xml b/config/dev/log4j2.xml
index cb89e2c865..f6e9ce38d9 100644
--- a/config/dev/log4j2.xml
+++ b/config/dev/log4j2.xml
@@ -135,7 +135,7 @@
 
             <DefaultRolloverStrategy min="1" max="100">
                 <Delete basePath="${archive}" maxDepth="1">
-                    <IfFileName glob="${log-name}*.log.gz"/>
+                    <IfFileName glob="${diagnostic-log-name}*.log.gz"/>
                     <IfLastModified age="60d">
                         <IfAny>
                             <IfAccumulatedFileSize exceeds="10 GB"/>
@@ -159,7 +159,7 @@
 
             <DefaultRolloverStrategy min="1" max="100">
                 <Delete basePath="${archive}" maxDepth="1">
-                    <IfFileName glob="${log-name}*.log.gz"/>
+                    <IfFileName glob="checkpoints_agent*.log.gz"/>
                     <IfLastModified age="60d">
                         <IfAny>
                             <IfAccumulatedFileSize exceeds="10 GB"/>
diff --git a/constants.properties b/constants.properties
index e103d5f502..ad41cab4f0 100644
--- a/constants.properties
+++ b/constants.properties
@@ -17,7 +17,7 @@ openTelemetryVersion=1.20.1
 openTelemetrySemConvVersion=1.20.1-alpha
 guavaVersion=28.0-jre
 # Quasar version to use with Java 8:
-quasarVersion=0.7.15_r3
+quasarVersion=0.7.16_r3
 # Quasar version to use with Java 11:
 quasarVersion11=0.8.1_r3
 jdkClassifier11=jdk11
@@ -78,7 +78,7 @@ joptSimpleVersion=5.0.2
 jansiVersion=1.18
 hibernateVersion=5.6.14.Final
 # h2Version - Update docs if renamed or removed.
-h2Version=2.1.214
+h2Version=2.2.224
 rxjavaVersion=1.3.8
 dokkaVersion=0.10.1
 eddsaVersion=0.3.0
diff --git a/node/src/main/resources/migration/node-core.changelog-v25.xml b/node/src/main/resources/migration/node-core.changelog-v25.xml
index bc31223fe7..dee14a6fa2 100644
--- a/node/src/main/resources/migration/node-core.changelog-v25.xml
+++ b/node/src/main/resources/migration/node-core.changelog-v25.xml
@@ -10,7 +10,7 @@
         <dropColumn tableName="node_transactions" columnName="states_to_record"/>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="create_sender_distribution_records_table">
+    <changeSet author="R3.Corda" id="create_sender_distr_recs_table">
         <createTable tableName="node_sender_distr_recs">
             <column name="timestamp" type="TIMESTAMP">
                 <constraints nullable="false"/>
@@ -34,11 +34,19 @@
     </changeSet>
 
     <changeSet author="R3.Corda" id="node_sender_distr_recs_pkey">
-        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_sender_distr_recs_pkey"
+        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator, transaction_id" constraintName="node_sender_distr_recs_pkey"
                        tableName="node_sender_distr_recs"/>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="create_receiver_distribution_records_table">
+    <changeSet author="R3.Corda" id="node_sender_distr_recs_add_indexes">
+        <createIndex indexName="node_sender_distr_recs_keyinfo_idx" tableName="node_sender_distr_recs">
+            <column name="transaction_id"/>
+            <column name="timestamp"/>
+            <column name="timestamp_discriminator"/>
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="R3.Corda" id="create_receiver_distr_recs_table">
         <createTable tableName="node_receiver_distr_recs">
             <column name="timestamp" type="TIMESTAMP">
                 <constraints nullable="false"/>
@@ -62,10 +70,18 @@
     </changeSet>
 
     <changeSet author="R3.Corda" id="node_receiver_distr_recs_pkey">
-        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_receiver_distr_recs_pkey"
+        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator, transaction_id" constraintName="node_receiver_distr_recs_pkey"
                        tableName="node_receiver_distr_recs"/>
     </changeSet>
 
+    <changeSet author="R3.Corda" id="node_receiver_distr_recs_add_indexes">
+        <createIndex indexName="node_receiver_distr_recs_keyinfo_idx" tableName="node_receiver_distr_recs">
+            <column name="transaction_id"/>
+            <column name="timestamp"/>
+            <column name="timestamp_discriminator"/>
+        </createIndex>
+    </changeSet>
+
     <changeSet author="R3.Corda" id="create_recovery_party_info_table">
         <createTable tableName="node_recovery_party_info">
             <column name="party_id" type="NVARCHAR(144)">
@@ -81,13 +97,13 @@
         <addPrimaryKey columnNames="party_id" constraintName="node_recovery_party_info_pkey" tableName="node_recovery_party_info"/>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="FK__sender_distribution_records__peer_party_id">
+    <changeSet author="R3.Corda" id="FK__sender_distr_recs__peer_party_id">
         <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_sender_distr_recs"
                                  constraintName="FK__send_distr__peer_party_id"
                                  referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="FK__receiver_distribution_records__peer_party_id">
+    <changeSet author="R3.Corda" id="FK__receiver_distr_recs__peer_party_id">
         <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_receiver_distr_recs"
                                  constraintName="FK__recv_distr__peer_party_id"
                                  referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>