diff --git a/.ci-local/travis/post-prepare.sh b/.ci-local/travis/post-prepare.sh
index 79b3d0c5..c6508839 100755
--- a/.ci-local/travis/post-prepare.sh
+++ b/.ci-local/travis/post-prepare.sh
@@ -13,9 +13,21 @@ pwd
 . ./.ci/travis/utils.sh
 
 # Add SUPPORT to RELEASE.local in the cache directory
-update_release_local SUPPORT ${CACHEDIR}
+#!update_release_local SUPPORT ${CACHEDIR}
 # Copy the RELEASE.local from the cache directory to motor's configure directory
-[ -e ./configure ] && cp -f ${CACHEDIR}/RELEASE.local ./configure/RELEASE.local
+#![ -e ./configure ] && cp -f ${CACHEDIR}/RELEASE.local ./configure/RELEASE.local
 
-echo -e "${ANSI_BLUE}Updated contents of RELEASE.local${ANSI_RESET}"
-cat ${CACHEDIR}/RELEASE.local
+#!echo -e "${ANSI_BLUE}Updated contents of RELEASE.local${ANSI_RESET}"
+#!cat ${CACHEDIR}/RELEASE.local
+
+# Comment out SUPPORT from motor's RELEASE file
+sed -i -e "s|^\(SUPPORT=.*\)$|#\1|g" ./configure/RELEASE
+#
+echo -e "${ANSI_BLUE}Updated motor/configure/RELEASE${ANSI_RESET}"
+grep SUPPORT ./configure/RELEASE
+
+# Comment out SUPPORT from motorOms's RELEASE file
+sed -i -e "s|^\(SUPPORT=.*\)$|#\1|g" ./modules/motorOms/configure/RELEASE
+#
+echo -e "${ANSI_BLUE}Updated motor/modules/motorOms/configure/RELEASE${ANSI_RESET}"
+grep SUPPORT ./modules/motorOms/configure/RELEASE
diff --git a/modules/Makefile b/modules/Makefile
index fe0e2146..a047bbfb 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -91,5 +91,8 @@ endif
 	$(ECHO) Creating $@, EPICS_BASE = $(EPICS_BASE)
 	@echo EPICS_BASE = $(EPICS_BASE)>> $@
 	
+	$(ECHO) Creating $@, SUPPORT = $(SUPPORT)
+	@echo SUPPORT = $(SUPPORT)>> $@
+	
 realclean:
 	$(RM) $(RELEASE_LOCAL)
diff --git a/modules/motorHytec b/modules/motorHytec
index b82e4a4b..aaa9af21 160000
--- a/modules/motorHytec
+++ b/modules/motorHytec
@@ -1 +1 @@
-Subproject commit b82e4a4bee64ac7b78f9affd9a15ffb0a2794f1e
+Subproject commit aaa9af21ec8c2bcc9120a80f9e028f3423c8ca96
diff --git a/modules/motorOmsAsyn b/modules/motorOmsAsyn
index 4fdd003b..549bd6dc 160000
--- a/modules/motorOmsAsyn
+++ b/modules/motorOmsAsyn
@@ -1 +1 @@
-Subproject commit 4fdd003bcede7728327026525ad633beab6cfcaf
+Subproject commit 549bd6dc241ece183ee4544f29ae01e94899acfd
diff --git a/motorApp/Makefile b/motorApp/Makefile
index 96d99cee..6737e02c 100644
--- a/motorApp/Makefile
+++ b/motorApp/Makefile
@@ -14,5 +14,6 @@ SoftMotorSrc_DEPEND_DIRS = MotorSrc
 
 DIRS += op
 DIRS += Db
+DIRS += iocsh
 
 include $(TOP)/configure/RULES_DIRS
diff --git a/motorApp/iocsh/Makefile b/motorApp/iocsh/Makefile
new file mode 100644
index 00000000..ae43c986
--- /dev/null
+++ b/motorApp/iocsh/Makefile
@@ -0,0 +1,4 @@
+TOP = ../..
+include $(TOP)/configure/CONFIG
+
+include $(TOP)/configure/RULES
diff --git a/iocsh/allstop.iocsh b/motorApp/iocsh/allstop.iocsh
similarity index 100%
rename from iocsh/allstop.iocsh
rename to motorApp/iocsh/allstop.iocsh