diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml
index 77a445864ebe..ecf95a529137 100644
--- a/java/java-impl/resources/META-INF/JavaPlugin.xml
+++ b/java/java-impl/resources/META-INF/JavaPlugin.xml
@@ -326,7 +326,25 @@
     <applicationService serviceInterface="com.intellij.refactoring.util.RefactoringConflictsUtil"
                         serviceImplementation="com.intellij.refactoring.util.RefactoringConflictsUtilImpl"/>
     <applicationService serviceImplementation="com.intellij.compiler.server.BuildManager" preload="true"/>
+
     <registryKey key="jps.build.use.workspace.model" description="Use workspace model inside JPS build process. The implementation isn't finished yet, refer to https://youtrack.jetbrains.com/issue/IJPL-409 for details." defaultValue="false"/>
+    <registryKey key="compiler.process.jdk" defaultValue="" description="Path to a JDK home. Force the build process to be run using the JDK specified. It is assumed that the jdk is at least of version 11."/>
+    <registryKey key="compiler.process.preload" defaultValue="true" description="After the build finishes, the IDE will preload and leave waiting in memory the build process for the next compilation. This will save time for process start and project model loading (may be noticeable for big projects)."/>
+    <registryKey key="compiler.process.debug.port" defaultValue="" description="Specifies the build port at which the build process will wait for debugger connections\n\
+   if 'Debug Build Process' (available via Find Action) is enabled.\n\
+  -1 means that a random available port will be chosen."/>
+    <registryKey key="compiler.automake.trigger.delay" defaultValue="300" description="Delay in milliseconds before triggering auto-make in response to file system events"/>
+    <registryKey key="compiler.automake.postpone.when.idle.less.than" defaultValue="3000" description="If at the moment the auto-build is about to start and the IDE is idle for less than specified milliseconds, the automatic build will be postponed in order not to interfere with the user's activity."/>
+    <registryKey key="compiler.automake.build.while.idle.timeout" defaultValue="60000" description="Application inactivity period, after which automatic builds may be triggered, if necessary, for all currently opened projects. Set to negative value to disable the feature."/>
+    <registryKey key="compiler.automake.allow.parallel" defaultValue="true" description="The option allows forcing automatically started builds to run in single-threaded mode even if 'Compile independent modules in parallel' is on\n\
+  This might help to save CPU resources for the foreground processes."/>
+    <registryKey key="compiler.document.save.enabled" defaultValue="false" description="Specify whether project save in response to document changes is enabled"/>
+    <registryKey key="compiler.document.save.trigger.delay" defaultValue="1500" description="Delay in milliseconds before triggering save in response to document changes"/>
+    <registryKey key="compiler.build.data.unused.threshold" defaultValue="30" description="If a project is not opened for the specified number of days, its build data will be cleared to save disk space"/>
+    <registryKey key="compiler.build.report.statistics" defaultValue="false" description="Turn on to display builder execution times as 'Information' messages in the compiler tool window."/>
+    <registryKey key="compiler.natural.int.multimap.impl" defaultValue="false" description="Experimental implementation for class-to-class dependency multimap in JPS caches.\nIf turned off after being turned on, project rebuild is required."/>
+    <registryKey key="compiler.process.use.portable.caches" defaultValue="false" description="Warning: for Intellij project only! \nTurn on to download compilation caches to reduce build time."/>
+
     <applicationService serviceInterface="com.intellij.execution.filters.ExceptionLineParserFactory"
                         serviceImplementation="com.intellij.execution.filters.ExceptionLineParserFactoryImpl"/>
     <compilableFileTypesProvider implementation="com.intellij.compiler.impl.javaCompiler.JavaCompilableFileTypesProvider"/>
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 3d9b8109244c..ae921b929648 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -813,51 +813,6 @@ analyze.exceptions.on.the.fly.description=Analyze the clipboard on frame activat
 build.toolwindow.show.inline.statistics=true
 build.toolwindow.show.inline.statistics.description=Show execution time of the build and build steps
 
-compiler.process.jdk=
-compiler.process.jdk.description=Path to a JDK home. Force the build process to be run using the JDK specified. It is assumed that the jdk is at least of version 11.
-
-compiler.process.preload=true
-compiler.process.preload.description=After the build finishes, the IDE will preload and leave waiting in memory the build process for the next compilation. This will save time for process start and project model loading (may be noticeable for big projects).
-
-compiler.gc.wsl=true
-compiler.gc.wsl.description=Run Build
-
-compiler.process.debug.port=
-compiler.process.debug.port.description=Specifies the build port at which the build process will wait for debugger connections\n\
-   if 'Debug Build Process' (available via Find Action) is enabled.\n\
-  -1 means that a random available port will be chosen.
-
-compiler.automake.trigger.delay=300
-compiler.automake.trigger.delay.description=Delay in milliseconds before triggering auto-make in response to file system events
-
-compiler.automake.postpone.when.idle.less.than=3000
-compiler.automake.postpone.when.idle.less.than.description=If at the moment the auto-build is about to start and the IDE is idle for less than specified milliseconds, the automatic build will be postponed in order not to interfere with the user's activity.
-
-compiler.automake.build.while.idle.timeout=60000
-compiler.automake.build.while.idle.timeout.description=Application inactivity period, after which automatic builds may be triggered, if necessary, for all currently opened projects. Set to negative value to disable the feature.
-
-compiler.automake.allow.parallel=true
-compiler.automake.allow.parallel.description=The option allows forcing automatically started builds to run in single-threaded mode even if 'Compile independent modules in parallel' is on\n\
-  This might help to save CPU resources for the foreground processes.
-
-compiler.document.save.enabled=false
-compiler.document.save.enabled.description=Specify whether project save in response to document changes is enabled
-compiler.document.save.trigger.delay=1500
-compiler.document.save.trigger.delay.description=Delay in milliseconds before triggering save in response to document changes
-
-compiler.build.data.unused.threshold=30
-compiler.build.data.unused.threshold.description=If a project is not opened for the specified number of days, its build data will be cleared to save disk space
-
-compiler.build.report.statistics=false
-compiler.build.report.statistics.description=Turn on to display builder execution times as 'Information' messages in the compiler tool window.
-
-compiler.natural.int.multimap.impl=false
-compiler.natural.int.multimap.impl.description=Experimental implementation for class-to-class dependency multimap in JPS caches.\nIf turned off after being turned on, project rebuild is required.
-
-compiler.process.use.portable.caches=false
-compiler.process.use.portable.caches.restartRequired=true
-compiler.process.use.portable.caches.description=Warning: for Intellij project only! \nTurn on to download compilation caches to reduce build time.
-
 lvcs.show.activity.view=true
 lvcs.show.activity.view.description=Show new ui for the "Local History"
 lvcs.open.diff.automatically=true