diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f079e97dd8..035112203e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## [v5.0-beta.40] - 2017-07-14
+
 * Issue **#343** : Fixed login expiry issue.
 
 * Issue **#345** : Allowed for multi depth config content import.
@@ -497,7 +499,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [v5.0-beta.4] - 2016-10-03
 * Initial open source release
 
-[Unreleased]: https://github.com/gchq/stroom/compare/v5.0-beta.39...HEAD
+[Unreleased]: https://github.com/gchq/stroom/compare/v5.0-beta.40...HEAD
+[v5.0-beta.40]: https://github.com/gchq/stroom/compare/v5.0-beta.39...v5.0-beta.40
 [v5.0-beta.39]: https://github.com/gchq/stroom/compare/v5.0-beta.38...v5.0-beta.39
 [v5.0-beta.38]: https://github.com/gchq/stroom/compare/v5.0-beta.37...v5.0-beta.38
 [v5.0-beta.37]: https://github.com/gchq/stroom/compare/v5.0-beta.36...v5.0-beta.37
diff --git a/pom.xml b/pom.xml
index 19fd5345b5b..3d537a6e0ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
   <artifactId>stroom</artifactId>
   <name>stroom</name>
   <description>STROOM</description>
-  <version>5.0-beta.39</version>
+  <version>5.0-beta.40</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/stroom-app-client/pom.xml b/stroom-app-client/pom.xml
index 4d6a42a57b4..8b7dcf7e059 100644
--- a/stroom-app-client/pom.xml
+++ b/stroom-app-client/pom.xml
@@ -38,7 +38,7 @@
     <parent>
         <groupId>stroom</groupId>
         <artifactId>stroom</artifactId>
-        <version>5.0-beta.39</version>
+        <version>5.0-beta.40</version>
     </parent>
 
     <artifactId>stroom-app-client</artifactId>
diff --git a/stroom-app-distribution/pom.xml b/stroom-app-distribution/pom.xml
index ba55da74891..5c770b5b1bc 100644
--- a/stroom-app-distribution/pom.xml
+++ b/stroom-app-distribution/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>stroom</groupId>
         <artifactId>stroom</artifactId>
-        <version>5.0-beta.39</version>
+        <version>5.0-beta.40</version>
     </parent>
 
     <artifactId>stroom-app-distribution</artifactId>
diff --git a/stroom-app/pom.xml b/stroom-app/pom.xml
index 5cf5b192caf..efbfab716a8 100644
--- a/stroom-app/pom.xml
+++ b/stroom-app/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-app</artifactId>
diff --git a/stroom-config/pom.xml b/stroom-config/pom.xml
index d8b7ecb5f0b..f13ef8cc541 100644
--- a/stroom-config/pom.xml
+++ b/stroom-config/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-config</artifactId>
diff --git a/stroom-core-client-widget/pom.xml b/stroom-core-client-widget/pom.xml
index 4708d1c0923..6929b4baf79 100644
--- a/stroom-core-client-widget/pom.xml
+++ b/stroom-core-client-widget/pom.xml
@@ -37,7 +37,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-core-client-widget</artifactId>
diff --git a/stroom-core-client/pom.xml b/stroom-core-client/pom.xml
index 4a5c5e9a67b..882c0fefff8 100644
--- a/stroom-core-client/pom.xml
+++ b/stroom-core-client/pom.xml
@@ -37,7 +37,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-core-client</artifactId>
diff --git a/stroom-core-server/pom.xml b/stroom-core-server/pom.xml
index 0f1e684002e..f607a6f8247 100644
--- a/stroom-core-server/pom.xml
+++ b/stroom-core-server/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-core-server</artifactId>
diff --git a/stroom-core-shared/pom.xml b/stroom-core-shared/pom.xml
index a552a4d3116..2224553cfc1 100644
--- a/stroom-core-shared/pom.xml
+++ b/stroom-core-shared/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-core-shared</artifactId>
diff --git a/stroom-dashboard/pom.xml b/stroom-dashboard/pom.xml
index fb18eb50fbc..cbe40bd1d4e 100644
--- a/stroom-dashboard/pom.xml
+++ b/stroom-dashboard/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-dashboard</artifactId>
diff --git a/stroom-entities/pom.xml b/stroom-entities/pom.xml
index 996377f1f23..1b20614d2fb 100644
--- a/stroom-entities/pom.xml
+++ b/stroom-entities/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-entities</artifactId>
diff --git a/stroom-expression/pom.xml b/stroom-expression/pom.xml
index 5e5de60d032..7f17ec8d6e7 100644
--- a/stroom-expression/pom.xml
+++ b/stroom-expression/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-expression</artifactId>
diff --git a/stroom-index/pom.xml b/stroom-index/pom.xml
index af8bb037050..24e0813b1f4 100644
--- a/stroom-index/pom.xml
+++ b/stroom-index/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-index</artifactId>
diff --git a/stroom-integrationtest/pom.xml b/stroom-integrationtest/pom.xml
index 2d1803b17cd..496de2ca7a9 100644
--- a/stroom-integrationtest/pom.xml
+++ b/stroom-integrationtest/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-integrationtest</artifactId>
diff --git a/stroom-pipeline/pom.xml b/stroom-pipeline/pom.xml
index 1000b8ca9f3..b61ef8b2d7d 100644
--- a/stroom-pipeline/pom.xml
+++ b/stroom-pipeline/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-pipeline</artifactId>
diff --git a/stroom-query-api/pom.xml b/stroom-query-api/pom.xml
index 65ea19e7216..296ed00e9fb 100644
--- a/stroom-query-api/pom.xml
+++ b/stroom-query-api/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-query-api</artifactId>
diff --git a/stroom-query-common/pom.xml b/stroom-query-common/pom.xml
index 0aa45788005..0efb6677546 100644
--- a/stroom-query-common/pom.xml
+++ b/stroom-query-common/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-query-common</artifactId>
diff --git a/stroom-remote/pom.xml b/stroom-remote/pom.xml
index 5f5ed2472a5..4e2e462ae5c 100644
--- a/stroom-remote/pom.xml
+++ b/stroom-remote/pom.xml
@@ -37,7 +37,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-remote</artifactId>
diff --git a/stroom-security-api/pom.xml b/stroom-security-api/pom.xml
index 9f58ffd1f4a..48cf13d5aeb 100644
--- a/stroom-security-api/pom.xml
+++ b/stroom-security-api/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-security-api</artifactId>
diff --git a/stroom-security-client-api/pom.xml b/stroom-security-client-api/pom.xml
index 7501db47da9..05046d30783 100644
--- a/stroom-security-client-api/pom.xml
+++ b/stroom-security-client-api/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-security-client-api</artifactId>
diff --git a/stroom-security/pom.xml b/stroom-security/pom.xml
index 8eb128ce53a..9ac10ccb930 100644
--- a/stroom-security/pom.xml
+++ b/stroom-security/pom.xml
@@ -38,7 +38,7 @@
     <parent>
         <groupId>stroom</groupId>
         <artifactId>stroom</artifactId>
-        <version>5.0-beta.39</version>
+        <version>5.0-beta.40</version>
     </parent>
 
     <artifactId>stroom-security</artifactId>
diff --git a/stroom-startup/pom.xml b/stroom-startup/pom.xml
index d908e98e154..1a24efa714a 100644
--- a/stroom-startup/pom.xml
+++ b/stroom-startup/pom.xml
@@ -38,7 +38,7 @@
     <parent>
         <groupId>stroom</groupId>
         <artifactId>stroom</artifactId>
-        <version>5.0-beta.39</version>
+        <version>5.0-beta.40</version>
     </parent>
 
     <artifactId>stroom-startup</artifactId>
diff --git a/stroom-statistics-api/pom.xml b/stroom-statistics-api/pom.xml
index 8bda95bf1cf..87dc9153c9a 100644
--- a/stroom-statistics-api/pom.xml
+++ b/stroom-statistics-api/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-statistics-api</artifactId>
diff --git a/stroom-statistics-client/pom.xml b/stroom-statistics-client/pom.xml
index e21ce9710da..03644ee8326 100644
--- a/stroom-statistics-client/pom.xml
+++ b/stroom-statistics-client/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-statistics-client</artifactId>
diff --git a/stroom-statistics-server/pom.xml b/stroom-statistics-server/pom.xml
index 277f6125a1c..5ea2f80fd1f 100644
--- a/stroom-statistics-server/pom.xml
+++ b/stroom-statistics-server/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-statistics-server</artifactId>
diff --git a/stroom-statistics-shared/pom.xml b/stroom-statistics-shared/pom.xml
index 8981d2aeb39..f8abd8efa92 100644
--- a/stroom-statistics-shared/pom.xml
+++ b/stroom-statistics-shared/pom.xml
@@ -37,7 +37,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-statistics-shared</artifactId>
diff --git a/stroom-test-common/pom.xml b/stroom-test-common/pom.xml
index 120c35ac5ec..f3efb6b9d09 100644
--- a/stroom-test-common/pom.xml
+++ b/stroom-test-common/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-test-common</artifactId>
diff --git a/stroom-util-shared/pom.xml b/stroom-util-shared/pom.xml
index f4d6cf8da2a..382917ebc81 100644
--- a/stroom-util-shared/pom.xml
+++ b/stroom-util-shared/pom.xml
@@ -38,7 +38,7 @@
 	<parent>
 		<groupId>stroom</groupId>
 		<artifactId>stroom</artifactId>
-		<version>5.0-beta.39</version>
+		<version>5.0-beta.40</version>
 	</parent>
 
   <artifactId>stroom-util-shared</artifactId>
diff --git a/stroom-util/pom.xml b/stroom-util/pom.xml
index e1d8767d51e..e741e15e4a7 100644
--- a/stroom-util/pom.xml
+++ b/stroom-util/pom.xml
@@ -38,7 +38,7 @@
   <parent>
     <groupId>stroom</groupId>
     <artifactId>stroom</artifactId>
-    <version>5.0-beta.39</version>
+    <version>5.0-beta.40</version>
   </parent>
 
   <artifactId>stroom-util</artifactId>