diff --git a/C/7zVersion.h b/C/7zVersion.h
index a3e42018..7c10f301 100644
--- a/C/7zVersion.h
+++ b/C/7zVersion.h
@@ -1,7 +1,7 @@
 #define MY_VER_MAJOR 22
 #define MY_VER_MINOR 01
 #define MY_VER_BUILD 05
-#define MY_VERSION_NUMBERS "22.01 ZS v1.5.5 R1"
+#define MY_VERSION_NUMBERS "22.01 ZS v1.5.5 R2"
 #define MY_VERSION MY_VERSION_NUMBERS
 
 #ifdef MY_CPU_NAME
diff --git a/CPP/Common/CommandLineParser.cpp b/CPP/Common/CommandLineParser.cpp
index 6bea75bb..465e0fde 100644
--- a/CPP/Common/CommandLineParser.cpp
+++ b/CPP/Common/CommandLineParser.cpp
@@ -6,108 +6,41 @@
 
 namespace NCommandLineParser {
 
-static const wchar_t * _SplitCommandLine(const wchar_t* s, UString &dest)
+bool SplitCommandLine(const UString &src, UString &dest1, UString &dest2)
 {
-  unsigned qcount = 0, bcount = 0;
-  wchar_t c; const wchar_t *f, *b;
-
-  dest.Empty();
-
-  // skip spaces:
-  while (isblank(*s)) { s++; };
-  b = f = s;
-
-  while ((c = *s++) != 0)
+  dest1.Empty();
+  dest2.Empty();
+  bool quoteMode = false;
+  unsigned i;
+  for (i = 0; i < src.Len(); i++)
   {
-    switch (c)
+    wchar_t c = src[i];
+    if ((c == L' ' || c == L'\t') && !quoteMode)
     {
-      case L'\\':
-        // a backslash - count them up to quote-char or regular char 
-        bcount++;
-      break;
-      case L'"':
-        // check quote char is escaped:
-        if (!(bcount & 1))
-        {
-          // preceded by an even number of '\', this is half that
-          // number of '\':
-          dest.AddFrom(f, (unsigned)(s - f - bcount/2 - 1)); f = s;
-          // count quote chars:
-          qcount++;
-        }
-        else
-        {
-          // preceded by an odd number of '\', this is half that
-          // number of '\' followed by an escaped '"':
-          dest.AddFrom(f, (unsigned)(s - f - bcount/2 - 2)); f = s;
-          dest += L'"';
-        }
-        bcount = 0;
-        // now count the number of consecutive quotes (inclusive
-        // the quote that lead us here):
-        while (*s == L'"')
-        {
-          s++;
-          if (++qcount == 3)
-          {
-            dest += L'"';
-            qcount = 0;
-          }
-        }
-        f = s;
-        if (qcount == 2)
-          qcount = 0;
-      break;
-      case L' ':
-      case L'\t':
-        // a space (end of arg or regular char):
-        if (!qcount)
-        {
-          // end of argument:
-          dest.AddFrom(f, (unsigned)(s - f - 1)); f = s;
-          // skip to the next one:
-          while (isblank(*s)) { s++; };
-          bcount = 0;
-          goto done;
-        }
-      // no break - a space as regular char:
-      default:
-        // a regular character, reset backslash counter
-        bcount = 0;
+      dest2 = src.Ptr(i + 1);
+      return i != 0;
     }
+    if (c == L'\"')
+      quoteMode = !quoteMode;
+    else
+      dest1 += c;
   }
-  s--; // back to NTS-zero char
-  dest.AddFrom(f, (unsigned)(s - f));
-done:
-  // remaining part if argument was found, otherwise NULL:
-  return (dest.Len() || *b) ? s : NULL;
-}
-
-bool SplitCommandLine(const UString& src, UString& dest1, UString& dest2)
-{
-  const wchar_t *s = src.Ptr();
-  s = _SplitCommandLine(s, dest1);
-  if (s) {
-    dest2 = s;
-    return true;
-  } else {
-    dest2.Empty();
-    return false;
-  }
+  return i != 0;
 }
 
-void SplitCommandLine(const UString &src, UStringVector &parts)
+void SplitCommandLine(const UString &s, UStringVector &parts)
 {
-  const wchar_t *s = src.Ptr();
+  UString sTemp (s);
+  sTemp.Trim();
   parts.Clear();
   for (;;)
   {
-    UString s1;
-    s = _SplitCommandLine(s, s1);
-    if (s)
+    UString s1, s2;
+    if (SplitCommandLine(sTemp, s1, s2))
       parts.Add(s1);
-    if (!s || !*s)
+    if (s2.IsEmpty())
       break;
+    sTemp = s2;
   }
 }
 
diff --git a/CPP/Common/MyString.cpp b/CPP/Common/MyString.cpp
index 599550fe..bf1638eb 100644
--- a/CPP/Common/MyString.cpp
+++ b/CPP/Common/MyString.cpp
@@ -1206,16 +1206,6 @@ UString &UString::operator=(const UString &s)
   return *this;
 }
 
-void UString::AddFrom(const wchar_t *s, unsigned len) // no check
-{
-  if (len) {
-    Grow(len);
-    wmemcpy(_chars + _len, s, len);
-    _len += len;
-    _chars[_len] = 0;
-  }
-}
-
 void UString::SetFrom(const wchar_t *s, unsigned len) // no check
 {
   if (len > _limit)
diff --git a/CPP/Common/MyString.h b/CPP/Common/MyString.h
index 05a25d45..c777c8c3 100644
--- a/CPP/Common/MyString.h
+++ b/CPP/Common/MyString.h
@@ -628,7 +628,6 @@ class UString
   UString &operator=(char c) { return (*this)=((wchar_t)(unsigned char)c); }
   UString &operator=(const wchar_t *s);
   UString &operator=(const UString &s);
-  void AddFrom(const wchar_t *s, unsigned len); // no check
   void SetFrom(const wchar_t *s, unsigned len); // no check
   void SetFromBstr(LPCOLESTR s);
   UString &operator=(const char *s);