diff --git a/modules/ca/configure/CONFIG_CA_VERSION b/modules/ca/configure/CONFIG_CA_VERSION
index cac0fcbfe..57bcd89ac 100644
--- a/modules/ca/configure/CONFIG_CA_VERSION
+++ b/modules/ca/configure/CONFIG_CA_VERSION
@@ -4,9 +4,9 @@ EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 13
 EPICS_CA_MAINTENANCE_VERSION = 5
 
-# Development flag, must be zero for official release versions
+# Development flag, set to zero for release versions
 
 EPICS_CA_DEVELOPMENT_FLAG = 1
 
-# Immediately after an official release the MAINTENANCE_VERSION
+# Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
diff --git a/modules/database/configure/CONFIG_DATABASE_VERSION b/modules/database/configure/CONFIG_DATABASE_VERSION
index a43738cfb..ebf04180a 100644
--- a/modules/database/configure/CONFIG_DATABASE_VERSION
+++ b/modules/database/configure/CONFIG_DATABASE_VERSION
@@ -4,9 +4,9 @@ EPICS_DATABASE_MAJOR_VERSION = 3
 EPICS_DATABASE_MINOR_VERSION = 17
 EPICS_DATABASE_MAINTENANCE_VERSION = 5
 
-# Development flag, must be zero for official release versions
+# Development flag, set to zero for release versions
 
 EPICS_DATABASE_DEVELOPMENT_FLAG = 1
 
-# Immediately after an official release the MAINTENANCE_VERSION
+# Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
diff --git a/modules/libcom/configure/CONFIG_LIBCOM_VERSION b/modules/libcom/configure/CONFIG_LIBCOM_VERSION
index 92c374f88..5953c7175 100644
--- a/modules/libcom/configure/CONFIG_LIBCOM_VERSION
+++ b/modules/libcom/configure/CONFIG_LIBCOM_VERSION
@@ -4,9 +4,9 @@ EPICS_LIBCOM_MAJOR_VERSION = 3
 EPICS_LIBCOM_MINOR_VERSION = 17
 EPICS_LIBCOM_MAINTENANCE_VERSION = 6
 
-# Development flag, must be zero for official release versions
+# Development flag, set to zero for release versions
 
 EPICS_LIBCOM_DEVELOPMENT_FLAG = 1
 
-# Immediately after an official release the MAINTENANCE_VERSION
+# Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
diff --git a/modules/normativeTypes b/modules/normativeTypes
index c6168a747..ba33c7443 160000
--- a/modules/normativeTypes
+++ b/modules/normativeTypes
@@ -1 +1 @@
-Subproject commit c6168a74772a93f18facc83631c13db381ff15bb
+Subproject commit ba33c7443c52689641c2a7377e39544d5dd326d2
diff --git a/modules/pvAccess b/modules/pvAccess
index 936f5d35d..c8c3cf4fd 160000
--- a/modules/pvAccess
+++ b/modules/pvAccess
@@ -1 +1 @@
-Subproject commit 936f5d35d845a3c47a55176876a0f607a582cf09
+Subproject commit c8c3cf4fd8b3490221c1e231c354e73735ee3813
diff --git a/modules/pvData b/modules/pvData
index 6ceaa6adb..b903df5d0 160000
--- a/modules/pvData
+++ b/modules/pvData
@@ -1 +1 @@
-Subproject commit 6ceaa6adb0b39dc3e37f064ca7e7bb5eea459d96
+Subproject commit b903df5d0daf08592368be2978efb2d828617a8c
diff --git a/modules/pvDatabase b/modules/pvDatabase
index 70ee85778..d7bd5628d 160000
--- a/modules/pvDatabase
+++ b/modules/pvDatabase
@@ -1 +1 @@
-Subproject commit 70ee85778268bb47397d4cf8aa07e019ccdd8392
+Subproject commit d7bd5628d47f82b2ad2cab2ea97dade98c2ee128
diff --git a/modules/pva2pva b/modules/pva2pva
index ce39c9320..d70a2ff8c 160000
--- a/modules/pva2pva
+++ b/modules/pva2pva
@@ -1 +1 @@
-Subproject commit ce39c932013e3af1d4750394ee69ba20bd13fa74
+Subproject commit d70a2ff8c31bc042477b4997d733b77e6029e8f9
diff --git a/modules/pvaClient b/modules/pvaClient
index aba40922e..246cceae3 160000
--- a/modules/pvaClient
+++ b/modules/pvaClient
@@ -1 +1 @@
-Subproject commit aba40922e6a96519c214c7644bfdf49a8bd0d7f6
+Subproject commit 246cceae3e682ac99413673195fec07dffa77267