diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2b871bdf0..1ef980e44 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,6 +12,6 @@ jobs:
       - run: dotnet restore NEsperAll.sln
       - run: msbuild NEsper.proj
       - store_artifacts:
-          path: build/NEsper-8.5.0.zip
+          path: build/NEsper-8.5.1.zip
       - store_artifacts:
           path: build/packages
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 79be44b19..43082231d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -17,7 +17,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<VersionPrefix Condition="'$(VersionPrefix)' == ''">8.5.0</VersionPrefix>
+		<VersionPrefix Condition="'$(VersionPrefix)' == ''">8.5.1</VersionPrefix>
 		<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 	</PropertyGroup>
 
diff --git a/NEsper.Documentation/NEsper.Documentation.shfbproj b/NEsper.Documentation/NEsper.Documentation.shfbproj
index e720d249f..79725b9f5 100644
--- a/NEsper.Documentation/NEsper.Documentation.shfbproj
+++ b/NEsper.Documentation/NEsper.Documentation.shfbproj
@@ -16,7 +16,7 @@
     <Name>NEsper.Documentation</Name>
     <!-- SHFB properties -->
     <FrameworkVersion>.NET Framework 4.6.2</FrameworkVersion>
-    <OutputPath>..\build\NEsper-8.5.0\docs\</OutputPath>
+    <OutputPath>..\build\NEsper-8.5.1\docs\</OutputPath>
     <HtmlHelpName>NEsper</HtmlHelpName>
     <Language>en-US</Language>
     <TransformComponentArguments>
diff --git a/NEsper.nuspec b/NEsper.nuspec
index 7fafb1f9e..11f7864c0 100644
--- a/NEsper.nuspec
+++ b/NEsper.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>NEsper</id>
-    <version>8.5.0</version>
+    <version>8.5.1</version>
     <authors>EsperTech</authors>
     <owners>EsperTech</owners>
     <language>en-us</language>
@@ -27,7 +27,7 @@
   </metadata>
 
   <files>
-    <file src="build\NEsper-8.5.0\lib\**" target="lib\{framework name}[{version}]" />
+    <file src="build\NEsper-8.5.1\lib\**" target="lib\{framework name}[{version}]" />
   </files>
 </package>
   
diff --git a/NEsper.proj b/NEsper.proj
index 9f57b4f63..52959574b 100644
--- a/NEsper.proj
+++ b/NEsper.proj
@@ -8,7 +8,7 @@
     <SolutionDir>$(MSBuildProjectDirectory)</SolutionDir>
     <!-- Distribution version -->
     <Version Condition=" '$(CCNetLabel)' != '' ">$(CCNetLabel)</Version>
-    <Version Condition=" '$(Version)' == '' ">8.5.0</Version>
+    <Version Condition=" '$(Version)' == '' ">8.5.1</Version>
 
     <!-- Build Directories -->
     <BuildPath>$(MSBuildProjectDirectory)\build</BuildPath>
diff --git a/VERSION b/VERSION
index 6d2890793..f9c71a52e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.5.0
+8.5.1
diff --git a/buildspec.yml b/buildspec.yml
index babc39d68..d75268402 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -4,7 +4,7 @@ env:
   variables:
     MASTER_PROJECT: .\NEsper.proj
     PACKAGE_DIRECTORY: .\packages
-    VERSION: 8.5.0
+    VERSION: 8.5.1
 
 phases:
   build:
diff --git a/src/NEsper.Common/common/internal/compile/stage3/ModuleCompileTimeServices.cs b/src/NEsper.Common/common/internal/compile/stage3/ModuleCompileTimeServices.cs
index 034d70710..511ad334a 100644
--- a/src/NEsper.Common/common/internal/compile/stage3/ModuleCompileTimeServices.cs
+++ b/src/NEsper.Common/common/internal/compile/stage3/ModuleCompileTimeServices.cs
@@ -117,7 +117,7 @@ public ModuleCompileTimeServices(
             ViewResolutionService = viewResolutionService;
             XmlFragmentEventTypeFactory = xmlFragmentEventTypeFactory;
 
-            #region ESPER_8.5.0
+            #region ESPER_8.5.1
             ClassProvidedCompileTimeRegistry = classProvidedCompileTimeRegistry;
             ClassProvidedCompileTimeResolver = classProvidedCompileTimeResolver;
             SerdeEventTypeRegistry = serdeEventTypeRegistry;
@@ -161,7 +161,7 @@ public ModuleCompileTimeServices(IContainer container)
             ViewResolutionService = null;
             XmlFragmentEventTypeFactory = null;
             
-            #region ESPER_8.5.0
+            #region ESPER_8.5.1
             ClassProvidedCompileTimeRegistry = null;
             ClassProvidedCompileTimeResolver = null;
             SerdeEventTypeRegistry = null;
@@ -235,7 +235,7 @@ public ModuleCompileTimeServices(IContainer container)
 
         public DataFlowCompileTimeRegistry DataFlowCompileTimeRegistry { get; } = new DataFlowCompileTimeRegistry();
 
-#region ESPER_8.5.0
+#region ESPER_8.5.1
         public ClassProvidedCompileTimeRegistry ClassProvidedCompileTimeRegistry { get; }
         
         public ClassProvidedCompileTimeResolver ClassProvidedCompileTimeResolver { get; }
diff --git a/src/NEsper.Compiler/internal/util/CompilerVersion.cs b/src/NEsper.Compiler/internal/util/CompilerVersion.cs
index 72e8b5f3e..7176e2c45 100644
--- a/src/NEsper.Compiler/internal/util/CompilerVersion.cs
+++ b/src/NEsper.Compiler/internal/util/CompilerVersion.cs
@@ -10,6 +10,6 @@ namespace com.espertech.esper.compiler.@internal.util
 {
     public class CompilerVersion
     {
-        public const string COMPILER_VERSION = "8.5.0";
+        public const string COMPILER_VERSION = "8.5.1";
     }
 } // end of namespace
\ No newline at end of file
diff --git a/src/NEsper.Compiler/internal/util/Version.cs b/src/NEsper.Compiler/internal/util/Version.cs
index dffc7556f..0ff47e1b7 100644
--- a/src/NEsper.Compiler/internal/util/Version.cs
+++ b/src/NEsper.Compiler/internal/util/Version.cs
@@ -11,7 +11,7 @@ namespace com.espertech.esper.compiler.@internal.util
     public class Version
     {
         public static string COMPILER_VERSION {
-            get => "8.5.0";
+            get => "8.5.1";
         }
     }
 } // end of namespace
\ No newline at end of file
diff --git a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseListener.cs b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseListener.cs
index 3833dcc69..ea12feecb 100644
--- a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseListener.cs
+++ b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseListener.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.0\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.1\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseVisitor.cs b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseVisitor.cs
index 7c4090e93..17137fd89 100644
--- a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseVisitor.cs
+++ b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseVisitor.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.0\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.1\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarLexer.cs b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarLexer.cs
index 9b3947a11..695516429 100644
--- a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarLexer.cs
+++ b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarLexer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.0\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.1\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarListener.cs b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarListener.cs
index 6a1c8aeaa..07efd1c48 100644
--- a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarListener.cs
+++ b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarListener.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.0\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.1\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarParser.cs b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarParser.cs
index 8e16a7ebb..0306f86c3 100644
--- a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarParser.cs
+++ b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarParser.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.0\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.1\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarVisitor.cs b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarVisitor.cs
index 713a1cbea..b58e51979 100644
--- a/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarVisitor.cs
+++ b/src/NEsper.Grammar/internal/generated/EsperEPL2GrammarVisitor.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.0\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.1\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/src/NEsper.Runtime/client/util/RuntimeVersion.cs b/src/NEsper.Runtime/client/util/RuntimeVersion.cs
index 8f95e703c..39b76b287 100644
--- a/src/NEsper.Runtime/client/util/RuntimeVersion.cs
+++ b/src/NEsper.Runtime/client/util/RuntimeVersion.cs
@@ -19,7 +19,7 @@ public class RuntimeVersion
         /// <summary>
         ///     Current runtime version.
         /// </summary>
-        public const string RUNTIME_VERSION = "8.5.0";
+        public const string RUNTIME_VERSION = "8.5.1";
 
         /// <summary>
         ///     Current runtime major version.
diff --git a/tst/NEsper.Regression/suite/client/deploy/ClientDeployVersion.cs b/tst/NEsper.Regression/suite/client/deploy/ClientDeployVersion.cs
index 06b664fe6..5006d4f2b 100644
--- a/tst/NEsper.Regression/suite/client/deploy/ClientDeployVersion.cs
+++ b/tst/NEsper.Regression/suite/client/deploy/ClientDeployVersion.cs
@@ -37,7 +37,7 @@ public void Run(RegressionEnvironment env)
 				EPCompiled compiled = EPCompiledIOUtil.Read(new File(file));
 
 				var versionMismatchMsg =
-					"Major or minor version of compiler and runtime mismatch; The runtime version is 8.5.0 and the compiler version of the compiled unit is 8.0.0";
+					"Major or minor version of compiler and runtime mismatch; The runtime version is 8.5.1 and the compiler version of the compiled unit is 8.0.0";
 				AssertMessage(
 					Assert.Throws<EPDeployDeploymentVersionException>(
 						() => env.Runtime.DeploymentService.Deploy(compiled)),
@@ -51,7 +51,7 @@ public void Run(RegressionEnvironment env)
 				AssertMessage(
 					Assert.Throws<EPException>(
 						() => env.Runtime.FireAndForgetService.ExecuteQuery(compiled)),
-					"Major or minor version of compiler and runtime mismatch; The runtime version is 8.5.0 and the compiler version of the compiled unit is 8.0.0");
+					"Major or minor version of compiler and runtime mismatch; The runtime version is 8.5.1 and the compiler version of the compiled unit is 8.0.0");
 #endif
 			}
 		}