diff --git a/Makefile b/Makefile
index 7f78a8d2e7ade68ab71b41783efb4c559fbaef0f..b0faf3723bde3c3a3cc6a050021a4e6e38663b8a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,16 @@
 #  You should have received a copy of the GNU General Public License along with
 #  this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt
 #
-# Author  : Jeong Han Lee
-# email   : han.lee@esss.se
-# Date    : Wednesday, October 18 21:17:45 CEST 2017
-# version : 0.1.1
+# Author   : Jeong Han Lee
+# email    : han.lee@esss.se
+# Date     : Wednesday, October 18 21:17:45 CEST 2017
+# version  : 0.1.1
 #
+# Author 2 : Simon Rose
+# email    : simon.rose@ess.eu
+# Date     : Monday, March 2
+# version  : 3.2.0
+
 
 TOP:=$(CURDIR)
 
diff --git a/configure/RELEASE b/configure/RELEASE
index 8c5414bd329073da6b3d268ff2a51bb16cac1f79..7d55e7d55235b454fd4ef0b6034b69c4cefb3638 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -1,7 +1,7 @@
 EPICS_BASE=/epics/base-7.0.3.1
 
 E3_REQUIRE_NAME:=require
-E3_REQUIRE_VERSION:=3.1.2
+E3_REQUIRE_VERSION:=3.2.0
 
 
 # The definitions shown below can also be placed in an untracked RELEASE.local
diff --git a/configure/RELEASE_DEV b/configure/RELEASE_DEV
index 307e89a11ecf2ebaa5e4621256e1565d53e64b56..d8f2fe0e7d03650b1666fc49e9871aae182d21b8 100644
--- a/configure/RELEASE_DEV
+++ b/configure/RELEASE_DEV
@@ -1,7 +1,7 @@
-EPICS_BASE=/epics/base-7.0.3
+EPICS_BASE=/epics/base-7.0.3.1
 
 E3_REQUIRE_NAME:=require
-E3_REQUIRE_VERSION:=3.1.2
+E3_REQUIRE_VERSION:=3.2.0
 
 
 # The definitions shown below can also be placed in an untracked RELEASE.local
diff --git a/configure/modules/RULES_DBDCAT b/configure/modules/RULES_DBDCAT
new file mode 100644
index 0000000000000000000000000000000000000000..49da9b144aa8b64e02a68bc16aec813711a8f5e8
--- /dev/null
+++ b/configure/modules/RULES_DBDCAT
@@ -0,0 +1,32 @@
+# Extra rules to expand .dbd files. Taken from $(EPICS_BASE)/configure/RULES.Db
+#
+#
+
+DBDCAT_SOURCES += $(foreach file, $($*_DBD), $(DBDCAT_SOURCE) )
+DBDCAT_SOURCE = $(firstword $(wildcard $(file) $(foreach dir,  \
+    $(DBD_SEARCH_DIRS),$(addsuffix /$(file),$(dir)))) \
+    $(COMMON_DIR)/$(file))
+
+DBDCAT_COMMAND = $(if $(DBDCAT_SOURCES),\
+    $(CAT) $(DBDCAT_SOURCES) > $(notdir $@),\
+    @echo "No input files for $(notdir $@)")
+
+INSTALL_DBDS += $(addprefix $(INSTALL_DBD)/,$(DBDCAT))
+
+
+define  DBDCAT_template
+$$(COMMON_DIR)/$(1).dbd: ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
+endef
+$(foreach name,$(subst .dbd,,$(DBDCAT)), $(eval $(call DBDCAT_template,$(name))))
+
+$(DBDCAT):$(COMMON_DIR)/%.dbd:
+	$(ECHO) "Creating dbd file $(notdir $@)"
+	@$(RM) $(notdir $@)
+	$(DBDCAT_COMMAND)
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.dbd:
+	$(ECHO) "Creating dbd file $(notdir $@)"
+	@$(RM) $(notdir $@)
+	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $($*_DBD)
+	@$(MV) $(notdir $@) $@
\ No newline at end of file
diff --git a/configure/modules/RULES_E3 b/configure/modules/RULES_E3
index 2764409f0d4e7c7d23e7b29f8b5a98542bb8ffec..83fb10b0c2b1d0035c06e96b3f56f801f570caf9 100644
--- a/configure/modules/RULES_E3
+++ b/configure/modules/RULES_E3
@@ -51,6 +51,9 @@ celluninstall: conf
 build: conf checkout vlibs
 	$(QUIET) $(E3_MODULE_MAKE_CMDS) build
 
+# Runs the debug command from driver.Makefile which outputs a lot of information about the build process
+debug:
+	$(QUIET) $(E3_MODULE_MAKE_CMDS) debug
 
 ## Clean, build, and install the EPICS Module : $(E3_MODULE_NAME)
 rebuild: clean build install
diff --git a/tools/ess-env.conf b/tools/ess-env.conf
index 9e68fef009695f98ccee0f4b99e2086c4d76479f..b15f5a50b9d8dd26acda10e7a68d13e49f675cea 100644
--- a/tools/ess-env.conf
+++ b/tools/ess-env.conf
@@ -1 +1 @@
-IOCSH_HASH_VERSION=84eef48
+IOCSH_HASH_VERSION=3994829