diff --git a/.idea/libraries/netty_buffer.xml b/.idea/libraries/netty_buffer.xml
index 17568bfcf893..584f45f0de15 100644
--- a/.idea/libraries/netty_buffer.xml
+++ b/.idea/libraries/netty_buffer.xml
@@ -1,23 +1,23 @@
 <component name="libraryTable">
   <library name="netty-buffer" type="repository">
-    <properties maven-id="io.netty:netty-buffer:4.2.0.Alpha2">
+    <properties maven-id="io.netty:netty-buffer:4.2.0.Alpha3">
       <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.2.0.Alpha2/netty-buffer-4.2.0.Alpha2.jar">
-          <sha256sum>1064f8562e579cc8f55fca10257005ae83371521e821aa283a545ed486590a9b</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.2.0.Alpha3/netty-buffer-4.2.0.Alpha3.jar">
+          <sha256sum>f8a9afa625134827f93c4b86c2698b99290d5c3e8c532da9d7747cfb92e3d01d</sha256sum>
         </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-common/4.2.0.Alpha2/netty-common-4.2.0.Alpha2.jar">
-          <sha256sum>c6081ec4146ab661dbccb52fa72bd5ef8f4d139a2ea2aa1de5fcc41934ec5e9b</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-common/4.2.0.Alpha3/netty-common-4.2.0.Alpha3.jar">
+          <sha256sum>ae7b0324a91d896f035f00f3b6cb929dccdd3fbebcee5b35282ce75fd09de985</sha256sum>
         </artifact>
       </verification>
     </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.2.0.Alpha2/netty-buffer-4.2.0.Alpha2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.2.0.Alpha2/netty-common-4.2.0.Alpha2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.2.0.Alpha3/netty-buffer-4.2.0.Alpha3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.2.0.Alpha3/netty-common-4.2.0.Alpha3.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.2.0.Alpha2/netty-buffer-4.2.0.Alpha2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.2.0.Alpha2/netty-common-4.2.0.Alpha2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.2.0.Alpha3/netty-buffer-4.2.0.Alpha3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.2.0.Alpha3/netty-common-4.2.0.Alpha3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/netty_codec_http.xml b/.idea/libraries/netty_codec_http.xml
index c4f81cf92b90..31a2aaaeb0e4 100644
--- a/.idea/libraries/netty_codec_http.xml
+++ b/.idea/libraries/netty_codec_http.xml
@@ -1,27 +1,30 @@
 <component name="libraryTable">
   <library name="netty-codec-http" type="repository">
-    <properties maven-id="io.netty:netty-codec-http2:4.2.0.Alpha2">
+    <properties maven-id="io.netty:netty-codec-http2:4.2.0.Alpha3">
       <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.2.0.Alpha2/netty-codec-http2-4.2.0.Alpha2.jar">
-          <sha256sum>b7cb86fa4043cfdcbd6a17a8ac9b55049eacfb55fcdfd0f017a7f191ff20f03c</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.2.0.Alpha3/netty-codec-http2-4.2.0.Alpha3.jar">
+          <sha256sum>fc82eb46c5ff23f26c81948fbdd270d79eee95386a409e07b3941dc8ac841ef0</sha256sum>
         </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.2.0.Alpha2/netty-transport-4.2.0.Alpha2.jar">
-          <sha256sum>98d5a845870faa514f341f6e6798222468d92493cb274197114f6fd15e1e0505</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.2.0.Alpha3/netty-transport-4.2.0.Alpha3.jar">
+          <sha256sum>6ca2870309fe9c8f762995a27618153a3163ad6282e8ace6d4c53102b530360b</sha256sum>
         </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.2.0.Alpha2/netty-resolver-4.2.0.Alpha2.jar">
-          <sha256sum>0e9c2436b0875edf60f10fefccf75496eb0bcbbe629c811d37bdf05e78fc9378</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.2.0.Alpha3/netty-resolver-4.2.0.Alpha3.jar">
+          <sha256sum>2649883b71d6a7372b9f421aab0b7d1933e45df38b91079e8244b76fc399949f</sha256sum>
         </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.2.0.Alpha2/netty-codec-4.2.0.Alpha2.jar">
-          <sha256sum>c045cb566117966475c9ca6e7347358e9d674020ec459c6c9e371bca1634d64e</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.2.0.Alpha3/netty-codec-4.2.0.Alpha3.jar">
+          <sha256sum>ede4b23ebe57b7f99f03aeb51771387b6b89b3a1cd05bd3c5f37c37fec5e77f7</sha256sum>
         </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.2.0.Alpha2/netty-handler-4.2.0.Alpha2.jar">
-          <sha256sum>06f557585e7629a18b5ef9b9ca5d91704e27914c8537624e989e916cef22df4e</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4.2.0.Alpha3/netty-codec-compression-4.2.0.Alpha3.jar">
+          <sha256sum>a759cd821e88a5c89435b6f55af6f5631b3bff61f0cd6c13c7ab10902b042358</sha256sum>
         </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.2.0.Alpha2/netty-transport-native-unix-common-4.2.0.Alpha2.jar">
-          <sha256sum>3f47369303d83ed61c03bfa2094e7439280c1f6b232cb4979547aa7f89654b90</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.2.0.Alpha3/netty-handler-4.2.0.Alpha3.jar">
+          <sha256sum>93ddb37b386a15fce6e2fb533289709885db77818c93a3ceefd2e9ec249dae1c</sha256sum>
         </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.2.0.Alpha2/netty-codec-http-4.2.0.Alpha2.jar">
-          <sha256sum>9587589453ace8f50ea6ce36baaff96154eedf262635743e05f68d1a2bb66098</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.2.0.Alpha3/netty-transport-native-unix-common-4.2.0.Alpha3.jar">
+          <sha256sum>b8ec622fc97a50b5ff0afc46f661f0c278fdb2c9744d2ce53a5173ed5b33b204</sha256sum>
+        </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.2.0.Alpha3/netty-codec-http-4.2.0.Alpha3.jar">
+          <sha256sum>baf8b8aaa85b3b0701451ad9ef5ab4169832d04bd19f6828b2ff9354d06b293b</sha256sum>
         </artifact>
       </verification>
       <exclude>
@@ -30,23 +33,25 @@
       </exclude>
     </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.2.0.Alpha2/netty-codec-http2-4.2.0.Alpha2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.2.0.Alpha2/netty-transport-4.2.0.Alpha2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.2.0.Alpha2/netty-resolver-4.2.0.Alpha2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.2.0.Alpha2/netty-codec-4.2.0.Alpha2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.2.0.Alpha2/netty-handler-4.2.0.Alpha2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.2.0.Alpha2/netty-transport-native-unix-common-4.2.0.Alpha2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.2.0.Alpha2/netty-codec-http-4.2.0.Alpha2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.2.0.Alpha3/netty-codec-http2-4.2.0.Alpha3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.2.0.Alpha3/netty-transport-4.2.0.Alpha3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.2.0.Alpha3/netty-resolver-4.2.0.Alpha3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.2.0.Alpha3/netty-codec-4.2.0.Alpha3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4.2.0.Alpha3/netty-codec-compression-4.2.0.Alpha3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.2.0.Alpha3/netty-handler-4.2.0.Alpha3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.2.0.Alpha3/netty-transport-native-unix-common-4.2.0.Alpha3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.2.0.Alpha3/netty-codec-http-4.2.0.Alpha3.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.2.0.Alpha2/netty-codec-http2-4.2.0.Alpha2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.2.0.Alpha2/netty-transport-4.2.0.Alpha2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.2.0.Alpha2/netty-resolver-4.2.0.Alpha2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.2.0.Alpha2/netty-codec-4.2.0.Alpha2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.2.0.Alpha2/netty-handler-4.2.0.Alpha2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.2.0.Alpha2/netty-transport-native-unix-common-4.2.0.Alpha2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.2.0.Alpha2/netty-codec-http-4.2.0.Alpha2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.2.0.Alpha3/netty-codec-http2-4.2.0.Alpha3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.2.0.Alpha3/netty-transport-4.2.0.Alpha3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.2.0.Alpha3/netty-resolver-4.2.0.Alpha3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.2.0.Alpha3/netty-codec-4.2.0.Alpha3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-compression/4.2.0.Alpha3/netty-codec-compression-4.2.0.Alpha3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.2.0.Alpha3/netty-handler-4.2.0.Alpha3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.2.0.Alpha3/netty-transport-native-unix-common-4.2.0.Alpha3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.2.0.Alpha3/netty-codec-http-4.2.0.Alpha3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/netty_codec_protobuf.xml b/.idea/libraries/netty_codec_protobuf.xml
new file mode 100644
index 000000000000..4f698a861ec3
--- /dev/null
+++ b/.idea/libraries/netty_codec_protobuf.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+  <library name="netty-codec-protobuf" type="repository">
+    <properties include-transitive-deps="false" maven-id="io.netty:netty-codec-protobuf:4.2.0.Alpha3">
+      <verification>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-protobuf/4.2.0.Alpha3/netty-codec-protobuf-4.2.0.Alpha3.jar">
+          <sha256sum>13543f8cf804cdff6570e3d39da30f1d85b4331dfa81d870ffc5af4680a1c154</sha256sum>
+        </artifact>
+      </verification>
+    </properties>
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-protobuf/4.2.0.Alpha3/netty-codec-protobuf-4.2.0.Alpha3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-protobuf/4.2.0.Alpha3/netty-codec-protobuf-4.2.0.Alpha3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/netty_handler_proxy.xml b/.idea/libraries/netty_handler_proxy.xml
index 3fe213d42bf7..0ccc38a6093e 100644
--- a/.idea/libraries/netty_handler_proxy.xml
+++ b/.idea/libraries/netty_handler_proxy.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="netty-handler-proxy" type="repository">
-    <properties maven-id="io.netty:netty-handler-proxy:4.2.0.Alpha2">
+    <properties maven-id="io.netty:netty-handler-proxy:4.2.0.Alpha3">
       <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4.2.0.Alpha2/netty-handler-proxy-4.2.0.Alpha2.jar">
-          <sha256sum>6c204eb01f9763c58c6b553b2f3d4d391af6f827e088dccce2f4a2266533a100</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4.2.0.Alpha3/netty-handler-proxy-4.2.0.Alpha3.jar">
+          <sha256sum>0569b16f326ed9007e95f025eb35a02a5a0de23dfae77f2c6e0181f1e5abc5e3</sha256sum>
         </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4.2.0.Alpha2/netty-codec-socks-4.2.0.Alpha2.jar">
-          <sha256sum>422787412b2fa5c7be7a20efefb69a44d9f1349ce30a49b6fa95f822aad09464</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4.2.0.Alpha3/netty-codec-socks-4.2.0.Alpha3.jar">
+          <sha256sum>150bc57e4cd8eb4621afaf4dbb241b5411c064abde446707f4eed1474c3da81d</sha256sum>
         </artifact>
       </verification>
       <exclude>
@@ -18,13 +18,13 @@
       </exclude>
     </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4.2.0.Alpha2/netty-handler-proxy-4.2.0.Alpha2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4.2.0.Alpha2/netty-codec-socks-4.2.0.Alpha2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4.2.0.Alpha3/netty-handler-proxy-4.2.0.Alpha3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4.2.0.Alpha3/netty-codec-socks-4.2.0.Alpha3.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4.2.0.Alpha2/netty-handler-proxy-4.2.0.Alpha2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4.2.0.Alpha2/netty-codec-socks-4.2.0.Alpha2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4.2.0.Alpha3/netty-handler-proxy-4.2.0.Alpha3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4.2.0.Alpha3/netty-codec-socks-4.2.0.Alpha3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt
index 828183695121..2a0918851d12 100644
--- a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt
+++ b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt
@@ -76,10 +76,33 @@ suspend fun buildCommunityStandaloneJpsBuilder(targetDir: Path,
   layout.withModule("intellij.space.java.jps", "space-java-jps.jar")
 
   for (it in listOf(
-    "jna", "OroMatcher", "ASM", "protobuf", "cli-parser", "Log4J", "jgoodies-forms", "Eclipse",
-    "netty-codec-http", "lz4-java", "commons-codec", "commons-logging", "http-client", "slf4j-api", "plexus-utils",
-    "jetbrains-annotations", "gson", "jps-javac-extension", "fastutil-min", "kotlin-stdlib",
-    "commons-lang3", "maven-resolver-provider", "netty-buffer", "aalto-xml", "caffeine", "jetbrains.kotlinx.metadata.jvm"
+    "jna",
+    "OroMatcher",
+    "ASM",
+    "protobuf",
+    "cli-parser",
+    "Log4J",
+    "jgoodies-forms",
+    "Eclipse",
+    "netty-codec-http",
+    "netty-codec-protobuf",
+    "lz4-java",
+    "commons-codec",
+    "commons-logging",
+    "http-client",
+    "slf4j-api",
+    "plexus-utils",
+    "jetbrains-annotations",
+    "gson",
+    "jps-javac-extension",
+    "fastutil-min",
+    "kotlin-stdlib",
+    "commons-lang3",
+    "maven-resolver-provider",
+    "netty-buffer",
+    "aalto-xml",
+    "caffeine",
+    "jetbrains.kotlinx.metadata.jvm"
   )) {
     layout.withProjectLibrary(it, LibraryPackMode.STANDALONE_MERGED)
   }
diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml
index 3b5b9853add1..f4129eb73fcd 100644
--- a/java/compiler/impl/intellij.java.compiler.impl.iml
+++ b/java/compiler/impl/intellij.java.compiler.impl.iml
@@ -54,6 +54,7 @@
     <orderEntry type="library" name="opentelemetry" level="project" />
     <orderEntry type="library" name="opentelemetry-semconv" level="project" />
     <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
+    <orderEntry type="library" name="netty-codec-protobuf" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/plugin/plugin-content.yaml b/java/plugin/plugin-content.yaml
index 7e0544b6438a..5266a2fd7d8b 100644
--- a/java/plugin/plugin-content.yaml
+++ b/java/plugin/plugin-content.yaml
@@ -132,5 +132,11 @@
 - name: lib/modules/intellij.java.vcs.jar
   contentModules:
   - name: intellij.java.vcs
+- name: lib/netty-codec-protobuf.jar
+  projectLibraries:
+  - name: netty-codec-protobuf
+    files:
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-protobuf/4/netty-codec-protobuf-4.jar
+    reason: withProjectLibrary
 - name: lib/rt/debugger-agent.jar
 - name: lib/sa-jdwp.jar
\ No newline at end of file
diff --git a/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml b/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
index 7df6815c17d7..4c2558e26fbf 100644
--- a/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
+++ b/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
@@ -15,5 +15,6 @@
     <orderEntry type="library" name="jps-javac-extension" level="project" />
     <orderEntry type="library" name="netty-buffer" level="project" />
     <orderEntry type="library" name="protobuf" level="project" />
+    <orderEntry type="library" name="netty-codec-protobuf" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml
index 3ffd71e395c0..c2ee957353f9 100644
--- a/jps/jps-builders/intellij.platform.jps.build.iml
+++ b/jps/jps-builders/intellij.platform.jps.build.iml
@@ -72,5 +72,6 @@
     <orderEntry type="library" name="jetbrains.kotlinx.metadata.jvm" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="hash4j" level="project" />
+    <orderEntry type="library" name="netty-codec-protobuf" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
index 2701d5b791df..5c41d29ff29a 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
@@ -20,6 +20,7 @@ import com.jgoodies.forms.layout.CellConstraints;
 import com.thoughtworks.qdox.JavaProjectBuilder;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.EventLoopGroup;
+import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.protobuf.ProtobufDecoder;
 import io.netty.resolver.AddressResolverGroup;
 import io.netty.util.NetUtil;
@@ -58,7 +59,8 @@ public final class ClasspathBootstrap {
     EventLoopGroup.class, // netty transport
     AddressResolverGroup.class, // netty resolver
     ByteBufAllocator.class, // netty buffer
-    ProtobufDecoder.class,  // netty codec
+    ByteToMessageDecoder.class, // netty codec http
+    ProtobufDecoder.class,  // netty codec protobuf
     Message.class, // protobuf
   };
 
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
index 0e01d7de4704..4d6a28e74318 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
@@ -860,11 +860,13 @@ object CommunityLibraryLicenses {
                    url = "https://github.com/loomchild/segment")
       .mit("https://github.com/loomchild/segment/blob/master/LICENSE.txt")
       .suppliedByPersons("Jarek Lipski"),
-    LibraryLicense(name = "netty-buffer", libraryName = "netty-buffer", url = "https://netty.io").apache()
+    LibraryLicense(name = "netty-buffer", libraryName = "netty-buffer", url = "https://netty.io").apache("https://github.com/netty/netty/blob/4.1/LICENSE.txt")
       .suppliedByOrganizations("The Netty project"),
-    LibraryLicense(name = "netty-codec-http", libraryName = "netty-codec-http", url = "https://netty.io").apache()
+    LibraryLicense(name = "netty-codec-http", libraryName = "netty-codec-http", url = "https://netty.io").apache("https://github.com/netty/netty/blob/4.1/LICENSE.txt")
       .suppliedByOrganizations("The Netty project"),
-    LibraryLicense(name = "netty-handler-proxy", libraryName = "netty-handler-proxy", url = "https://netty.io").apache()
+    LibraryLicense(name = "netty-codec-protobuf", libraryName = "netty-codec-protobuf", url = "https://netty.io").apache("https://github.com/netty/netty/blob/4.1/LICENSE.txt")
+      .suppliedByOrganizations("The Netty project"),
+    LibraryLicense(name = "netty-handler-proxy", libraryName = "netty-handler-proxy", url = "https://netty.io").apache("https://github.com/netty/netty/blob/4.1/LICENSE.txt")
       .suppliedByOrganizations("The Netty project"),
     LibraryLicense(libraryName = "ngram-slp", url = "https://github.com/SLP-team/SLP-Core")
       .mit("https://github.com/SLP-team/SLP-Core/blob/master/LICENSE")
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt
index c9e11ab394eb..ca824f2ab485 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt
@@ -15,6 +15,8 @@ object JavaPluginLayout {
 
       spec.excludeFromModule("intellij.java.resources.en", "search/searchableOptions.xml")
 
+      spec.withProjectLibrary("netty-codec-protobuf", "netty-codec-protobuf.jar")
+
       spec.withModule("intellij.platform.jps.build.launcher", "jps-launcher.jar")
       spec.withModule("intellij.platform.jps.build", "jps-builders.jar")
       spec.withModule("intellij.platform.jps.build.javac.rt", "jps-builders-6.jar")
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
index 68368f5723a8..f577bfeb54bf 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
@@ -44,6 +44,7 @@ private val libsThatUsedInJps = java.util.Set.of(
   "ASM",
   "netty-buffer",
   "netty-codec-http",
+  "netty-codec-protobuf",
   "netty-handler-proxy",
   "gson",
   "Log4J",