diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index eb56cf75a..d70e1659f 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 = "8";
 	public const string Build = "1";
-	public const string Revision = "2991";
+	public const string Revision = "2998";
 
         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 7769738a2..4032e0629 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%MINOR%=8
-%REVISION%=2991
 %COREVERSION%=1
+%REVISION%=2998
+%MINOR%=8
 %MAJOR%=3
diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt
index 8e66c057e..26d4186b9 100644
--- a/Release/pabcversion.txt
+++ b/Release/pabcversion.txt
@@ -1 +1 @@
-3.8.1.2991
+3.8.1.2998
diff --git a/ReleaseGenerators/PT4/PT4pabc.dll b/ReleaseGenerators/PT4/PT4pabc.dll
index a918de4ee..eedde9746 100644
Binary files a/ReleaseGenerators/PT4/PT4pabc.dll and b/ReleaseGenerators/PT4/PT4pabc.dll differ
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index c67391914..38231d97c 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.8.1.2991'
+!define VERSION '3.8.1.2998'
diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas
index 4162f32f2..4d5638e20 100644
--- a/TestSuite/CompilationSamples/PABCSystem.pas
+++ b/TestSuite/CompilationSamples/PABCSystem.pas
@@ -10290,13 +10290,15 @@ begin
   var previous: T;
   var it := Self.GetEnumerator();
   if (it.MoveNext()) then
+  begin  
     previous := it.Current;
   
-  while (it.MoveNext()) do
-  begin
-    yield (previous, it.Current);
-    previous := it.Current;
-  end
+    while (it.MoveNext()) do
+    begin
+      yield (previous, it.Current);
+      previous := it.Current;
+    end;
+  end;
 end;
 
 /// Превращает последовательность в последовательность n-ок соседних элементов
@@ -10320,13 +10322,15 @@ begin
   var previous: T;
   var it := Self.GetEnumerator();
   if (it.MoveNext()) then
+  begin  
     previous := it.Current;
   
-  while (it.MoveNext()) do
-  begin
-    yield func(previous, it.Current);
-    previous := it.Current;
-  end
+    while (it.MoveNext()) do
+    begin
+      yield func(previous, it.Current);
+      previous := it.Current;
+    end;
+  end;
   //  Result := Self.ZipTuple(Self.Skip(1)).Select(x->func(x[0],x[1]));
 end;
 
diff --git a/bin/Highlighting/PascalABCNET.xshd b/bin/Highlighting/PascalABCNET.xshd
index a7576e3f9..bc99e24af 100644
--- a/bin/Highlighting/PascalABCNET.xshd
+++ b/bin/Highlighting/PascalABCNET.xshd
@@ -273,7 +273,7 @@
 
 	</RuleSet>
 		
-	<RuleSet name = "CommentMarkerSet" ignorecase = "true">
+	<RuleSet name = "CommentMarkerSet" ignorecase = "false">
 		<Delimiters>&lt;&gt;~!@%^*()-+=|\#/{}[]:;"' ,	.?</Delimiters>
 		<KeyWords name = "ErrorWords" bold="true" italic="false" color="Red">
 			<Key word = "TODO" />
@@ -283,8 +283,17 @@
 			<Key word = "HACK" />
 			<Key word = "UNDONE" />
 	  	</KeyWords>
+		<KeyWords name = "Russian" bold="true" italic="true" color="Green" >
+			<Key word = "Задание" />
+			<Key word = "Указание" />
+			<Key word = "Замечание" />
+	  	</KeyWords>
+		<KeyWords name = "Russian1" bold="true" italic="false" color="Green">
+			<Key word = "Тема" />
+	  	</KeyWords>
 	</RuleSet>
 
+
 	<RuleSet name = "CompilerDirectivesSet" ignorecase = "true">
 		<Delimiters>&lt;&gt;~!@%^*()-+=|\#/{}[]:;"' ,	.?</Delimiters>
 
diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas
index 4162f32f2..4d5638e20 100644
--- a/bin/Lib/PABCSystem.pas
+++ b/bin/Lib/PABCSystem.pas
@@ -10290,13 +10290,15 @@ begin
   var previous: T;
   var it := Self.GetEnumerator();
   if (it.MoveNext()) then
+  begin  
     previous := it.Current;
   
-  while (it.MoveNext()) do
-  begin
-    yield (previous, it.Current);
-    previous := it.Current;
-  end
+    while (it.MoveNext()) do
+    begin
+      yield (previous, it.Current);
+      previous := it.Current;
+    end;
+  end;
 end;
 
 /// Превращает последовательность в последовательность n-ок соседних элементов
@@ -10320,13 +10322,15 @@ begin
   var previous: T;
   var it := Self.GetEnumerator();
   if (it.MoveNext()) then
+  begin  
     previous := it.Current;
   
-  while (it.MoveNext()) do
-  begin
-    yield func(previous, it.Current);
-    previous := it.Current;
-  end
+    while (it.MoveNext()) do
+    begin
+      yield func(previous, it.Current);
+      previous := it.Current;
+    end;
+  end;
   //  Result := Self.ZipTuple(Self.Skip(1)).Select(x->func(x[0],x[1]));
 end;
 
diff --git a/bin/PT4/pt4pabc.dll b/bin/PT4/pt4pabc.dll
index a918de4ee..eedde9746 100644
Binary files a/bin/PT4/pt4pabc.dll and b/bin/PT4/pt4pabc.dll differ