diff --git a/configure/CONFIG_ENV b/configure/CONFIG_ENV
index 1565b2ec9..59e72d883 100644
--- a/configure/CONFIG_ENV
+++ b/configure/CONFIG_ENV
@@ -47,6 +47,9 @@ EPICS_CAS_SERVER_PORT=
 EPICS_CAS_INTF_ADDR_LIST=""
 EPICS_CAS_IGNORE_ADDR_LIST=""
 
+# Servers to disable
+EPICS_IOC_IGNORE_SERVERS=""
+
 # Log Server:
 # EPICS_IOC_LOG_PORT Log server port number etc.
 EPICS_IOC_LOG_PORT=7004
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index 3a3f0d3be..276687c23 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -3,11 +3,11 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-  <title>EPICS Base R3.16.1 Release Notes</title>
+  <title>EPICS 7.0 Release Notes</title>
 </head>
 
 <body lang="en">
-<h1 align="center">EPICS Base Release 3.16.1</h1>
+<h1 align="center">EPICS Release 7.0.1</h1>
 
 <!-- Insert new items immediately below this template ...
 
@@ -17,6 +17,44 @@
 
 -->
 
+<h3>dbVerify() has been restored to dbStaticLib</h3>
+
+<p>This routine was removed in Base-3.16.1 but has been reimplemented in this
+release by special request. Note that the error message strings that it returns
+when verification fails have changed, but are still designed for display to the
+user.</p>
+
+<h3>Simulation mode improvements</h3>
+
+<p>Records that support simulation mode have two new fields, <tt>SSCN</tt>
+(Simulation Scan Mode) and <tt>SDLY</tt> (Simulation Delay). <tt>SSCN</tt> is a
+menu field that provides an alternate value for the <tt>SCAN</tt> field to be
+used while the record is in simulation mode. This is especially useful for I/O
+scanned records, for which simulation mode was not working at all. Setting
+<tt>SDLY</tt> to a positive value makes the record process asynchronously in
+simulation mode, with the second stage processing happening after the specified
+time (in seconds).</p>
+
+
+<h3>Extend the dbServer API with init/run/pause/stop methods</h3>
+
+<p>This change permits IOCs to be built that omit the CA server (RSRV) by
+removing its registrar entry which is now provided in the new <tt>rsrv.dbd</tt>
+file. Other server layers can be built into the IOC (alongside RSRV or in place
+of it) by registering them in a similar manner. The dbServer API is documented
+with Doxygen comments in the header file.</p>
+
+<p>Specific IOC server layers can be disabled at runtime by adding their name to
+the environment variable EPICS_IOC_IGNORE_SERVERS (separated by spaces if more
+than one should be ignored).</p>
+
+
+<h2 align="center">Changes from the 3.16 branch since 3.16.1</h2>
+
+<!-- Insert inherited items immediately below here ... -->
+
+
+
 <h2 align="center">Changes made between 3.16.0.1 and 3.16.1</h2>
 
 <h3>IOC Database Support for 64-bit integers</h3>
diff --git a/modules/database b/modules/database
index d5fc85a45..c528ca5ae 160000
--- a/modules/database
+++ b/modules/database
@@ -1 +1 @@
-Subproject commit d5fc85a451a62d99e86ef0651014c29eae510877
+Subproject commit c528ca5ae454d3cccb8396b8902751a05f9b8c27
diff --git a/modules/libcom b/modules/libcom
index 222162bcb..7b7abaea0 160000
--- a/modules/libcom
+++ b/modules/libcom
@@ -1 +1 @@
-Subproject commit 222162bcb60e615bf08a6e18d6ca359fef9a1dbc
+Subproject commit 7b7abaea0598a1b8ad0338a50f869152f31eedc8
