diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index 675e373b2..dd5698f85 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "5";
 	public const string Build = "0";
-	public const string Revision = "2170";
+	public const string Revision = "2171";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
diff --git a/Configuration/Version.defs b/Configuration/Version.defs
index 5dbe85bd8..8b7de748d 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%COREVERSION%=0
-%REVISION%=2170
 %MINOR%=5
+%REVISION%=2171
+%COREVERSION%=0
 %MAJOR%=3
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 4a0172a0b..157cf4125 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.5.0.2170'
+!define VERSION '3.5.0.2171'
diff --git a/TestSuite/xor_byte_int_fun.pas b/TestSuite/xor_byte_int_fun.pas
new file mode 100644
index 000000000..c476a480b
--- /dev/null
+++ b/TestSuite/xor_byte_int_fun.pas
@@ -0,0 +1,7 @@
+function f1: integer := 256;
+
+begin
+  var b: byte := 255; 
+  var i := f1 xor b; 
+  Assert(i=511);
+end.
\ No newline at end of file