diff --git a/java/debugger/impl/resources/META-INF/java-debugger.xml b/java/debugger/impl/resources/META-INF/java-debugger.xml
index 2aac46de309b..311ed782559c 100644
--- a/java/debugger/impl/resources/META-INF/java-debugger.xml
+++ b/java/debugger/impl/resources/META-INF/java-debugger.xml
@@ -202,14 +202,56 @@
                  description="Provide evaluatable context on Pause"/>
     <registryKey key="debugger.evaluate.on.pause.timeout.ms" defaultValue="500"
                  description="Maximum duration (in ms) of obtaining an evaluatable context for a Pause"/>
+    <registryKey key="debugger.enable.breakpoints.during.evaluation" defaultValue="false"
+                 description="Allow breakpoints to be hit while evaluating expressions"/>
     <registryKey key="debugger.navigation.from.console.prototype" defaultValue="false"
                  description="Alpha version of navigation from the printed lines in console to the printing source code"/>
     <registryKey key="debugger.collectible.value.retries.error" defaultValue="true"
                  description="Drop an error if there were too many debugger collectible value retries"/>
+    <registryKey key="debugger.run.suspend.helper" defaultValue="true"
+                 description="Run suspend helper by debug agent"/>
+    <registryKey key="debugger.new.suspend.state.tracking" defaultValue="true"
+                 description="Instead of making symmetrical suspend/resume operation, the end of operation returns the thread into the required state"/>
+    <registryKey key="debugger.filter.breakpoints.by.coroutine.id" defaultValue="true"
+                 description="When enabled uses unique coroutine id to filter stepping"/>
+    <registryKey key="debugger.how.to.switch.to.suspend.all" defaultValue="[IMMEDIATE_PAUSE*|PAUSE_WAITING_EVALUATION|METHOD_BREAKPOINT|DISABLE]"
+                 description="It is a way how the debugger engine will switch from suspend-thread context to suspend-all context"/>
+    <registryKey key="coroutine.panel.live.update" defaultValue="false"
+                 description="When enabled, Coroutine View will update its contents after every step. By default, the Coroutine View is collapsed after every step in favor of stepping performance."/>
+    <registryKey key="coroutine.panel.show.jobs.hierarchy" defaultValue="true"
+                 description="When enabled, Coroutine View displays the hierarchy of coroutine jobs; otherwise, it shows coroutines grouped by dispatchers."/>
     <registryKey key="debugger.compiling.evaluator" defaultValue="true"
                  description="Allow to compile the code before evaluation if needed"/>
     <registryKey key="debugger.compiling.evaluator.force" defaultValue="false"
                  description="Always compile the code before evaluation"/>
+    <registryKey key="debugger.compiling.evaluator.magic.accessor" defaultValue="false"
+                 description="Allow access to private members via generated accessor methods in the compiling evaluator"/>
+    <registryKey key="debugger.compiling.evaluator.reflection.access.with.java8" defaultValue="true"
+                 description="Allow reflective access in the compiling evaluator compatible with Java 8 rules"/>
+    <registryKey key="debugger.compiling.evaluator.extract.generated.class" defaultValue="true"
+                 description="Extract the generated class to a separate file (only for java versions lower than 11)"/>
+    <registryKey key="debugger.auto.fetch.icons" defaultValue="true"
+                 description="Automatically request icons for objects shown in debugger views when available"/>
+    <registryKey key="debugger.async.stacks.flows" defaultValue="true"
+                 description="Enable async stack traces for MutableSharedFlow"/>
+    <registryKey key="debugger.async.stacks.state.flows" defaultValue="true"
+                 description="Enable async stack traces for MutableStateFlow"/>
+    <registryKey key="debugger.async.stack.trace.for.exceptions.printing" defaultValue="true"
+                 description="Include async stack trace in exceptions' printed stack trace"/>
+    <registryKey key="debugger.keep.step.requests" defaultValue="false"
+                 description="Keep step requests active after a step completes (for advanced troubleshooting)"/>
+    <registryKey key="debugger.enable.memory.view" defaultValue="true"
+                 description="Enable the Memory view/tool window in the debugger"/>
+    <registryKey key="debugger.enable.overhead.monitor" defaultValue="true"
+                 description="Enable the debugger overhead monitor to track evaluation cost"/>
+    <registryKey key="debugger.memory.agent.debug" defaultValue="false"
+                 description="Enable debug logging to stdout from a memory agent"/>
+    <registryKey key="debugger.memory.agent.debug.path" defaultValue=""
+                 description="Force the debugger to use the specified memory agent library instead of the bundled one (only for debugging purposes). Will be used only if debugger.memory.agent.debug checked"/>
+    <registryKey key="debugger.memory.agent.action.timeout" defaultValue="-1"
+                 description="Set debugger memory agent action timeout in millis"/>
+    <registryKey key="debugger.memory.agent.use.in.memory.view" defaultValue="true"
+                 description="Use memory agent to estimate retained sizes in the Instances Window"/>
     <registryKey key="debugger.async.stack.trace.for.all.threads" defaultValue="true"
                  description="Get async stack trace for any thread using the same evaluationContext. By default debugger-agent only returns async stack trace for the current suspended thread."/>
     <registryKey key="debugger.stepping.current.thread.check.timeout.ms" defaultValue="100"
@@ -222,6 +264,95 @@
                  description="How many of threads allow to wait on the hit run-to-cursor breakpoint for the desired hit"/>"/>
     <registryKey key="debugger.log.jdi.in.unit.tests" defaultValue="false"
                  description="Enable full JDI logging under DebugProcessImpl.LOG.debug for unit tests"/>
+
+    <registryKey key="debugger.track.instrumentation" defaultValue="true"
+                 description="Track class instrumentation events during debugging"/>
+    <registryKey key="debugger.attach.to.process.action" defaultValue="false"
+                 description="Show the &quot;Attach to Process&quot; action in the run/debug tool window"/>
+    <registryKey key="debugger.sa.jdwp.debug" defaultValue="false"
+                 description="Enable additional JDWP debug logging for the shared agent"/>
+    <registryKey key="debugger.add.rt.jar" defaultValue="true"
+                 description="Add rt.jar to the classpath"/>
+    <registryKey key="debugger.evaluate.load.helper.in.separate.classloader" defaultValue="false"
+                 description="Always load helper classes in a new classloader"/>
+    <registryKey key="debugger.new.invocation.watcher" defaultValue="true"
+                 description="When resuming all, take into account the debugger model state of contexts and their resumed threads"/>
+    <registryKey key="debugger.retry.conditional.breakpoints" defaultValue="true"
+                 description="Retry to evaluate a condition in conditional breakpoints in the case of ObjectCollectedException"/>
+    <registryKey key="debugger.filter.breakpoints.during.stepping.using.debugger.engine" defaultValue="false"
+                 description="When enabled, uses the old mechanism to disable all events in other threads during stepping via applying JDI thread filter"/>
+    <registryKey key="debugger.call.tracing.arguments" defaultValue="true"
+                 description="Include method arguments in call tracing"/>
+    <registryKey key="debugger.renderers.annotations" defaultValue="true"
+                 description="Enable rendering values using annotations when available"/>
+    <registryKey key="debugger.jb.jdi" defaultValue="true"
+                 description="Use the new forked JDI implementation"/>
+    <registryKey key="debugger.async.jdi" defaultValue="true"
+                 description="Use async JDI to speed up JDWP communication"/>
+    <registryKey key="debugger.async.frames" defaultValue="true"
+                 description="Collect and show asynchronous call frames in stack traces"/>
+    <registryKey key="debugger.preload.event.info" defaultValue="true"
+                 description="Preload frequently used JDWP event info to reduce latency"/>
+    <registryKey key="debugger.preload.types.async" defaultValue="true"
+                 description="Preload the list of loaded classes asynchronously to reduce latency"/>
+    <registryKey key="debugger.preload.types.hierarchy" defaultValue="true"
+                 description="Request superclass and interfaces for each loaded class in advance to speed up further operations"/>
+    <registryKey key="debugger.evaluate.single.threaded.timeout" defaultValue="1000"
+                 description="Number of milliseconds to evaluate resuming only the current thread, then resume all threads"/>
+    <registryKey key="debugger.renderers.file" defaultValue="true"
+                 description="Enable file object renderer"/>
+    <registryKey key="debugger.renderers.arrays" defaultValue="true"
+                 description="Show the first elements for primitive and string arrays"/>
+    <registryKey key="debugger.renderers.arrays.max.primitives" defaultValue="100"
+                 description="Number of primitive values to show"/>
+    <registryKey key="debugger.renderers.arrays.max.strings" defaultValue="5"
+                 description="Number of string values to show"/>
+    <registryKey key="debugger.sync.commands.max.retries" defaultValue="5"
+                 description="Maximum number of times a synchronous debugger command may be rescheduled"/>
+    <registryKey key="debugger.sync.commands.reschedule.delay" defaultValue="50"
+                 description="Delay in milliseconds before rescheduling synchronous debugger commands to allow async tasks to finish; negative disables rescheduling"/>
+    <registryKey key="debugger.auto.attach.from.any.console" defaultValue="false"
+                 description="Auto-attach to all processes from any console output"/>
+    <registryKey key="debugger.auto.attach.from.console" defaultValue="false"
+                 description="Auto-attach to all processes available for debug from the console output"/>
+    <registryKey key="debugger.show.offsets.in.frames" defaultValue="false"
+                 description="Show instruction offset in the frames view"/>
+    <registryKey key="debugger.stop.on.graceful.exit" defaultValue="true"
+                 description="Immediately detach the debugger when a process is about to terminate"/>
+    <registryKey key="debugger.stack.frame.show.code.index" defaultValue="false"
+                 description="Show the bytecode index next to the line number for stack frames"/>
+    <registryKey key="debugger.method.breakpoints.entry.default" defaultValue="true"
+                 description="Stop only on method entry by default"/>
+    <registryKey key="debugger.emulate.method.breakpoints" defaultValue="true"
+                 description="Emulate method breakpoints with line breakpoints by default"/>
+    <registryKey key="debugger.intern.string.literals" defaultValue="false"
+                 description="Make string literal refer to the same instance of class String"/>
+    <registryKey key="debugger.capture.points.agent.debug" defaultValue="false"
+                 description="Enable debug logging for capture points agent"/>
+    <registryKey key="debugger.collection.breakpoint.agent.debug" defaultValue="false"
+                 description="Enable debug logging for collection breakpoints agent"/>
+    <registryKey key="debugger.capture.points.agent.annotations" defaultValue="true"
+                 description="Enable reading capture points from annotations"/>
+    <registryKey key="debugger.collection.watchpoints.enabled" defaultValue="false"
+                 description="Enable collection watchpoints support"/>
+    <registryKey key="debugger.async.stacks.coroutines" defaultValue="true"
+                 description="Enable async stack traces for coroutines"/>
+    <registryKey key="debugger.async.stacks.max.depth" defaultValue="500"
+                 description="Maximum depth of captured async stacks"/>
+    <registryKey key="debugger.log.async.stacks" defaultValue="false"
+                 description="Log async stack trace when log stack trace is checked in breakpoint properties"/>
+    <registryKey key="debugger.batch.evaluation" defaultValue="true"
+                 description="Evaluate multiple values in a single batch request to the debuggee"/>
+    <registryKey key="debugger.batch.evaluation.force" defaultValue="false"
+                 description="Force batch evaluation even when individual evaluation is possible"/>
+    <registryKey key="debugger.compiling.evaluator.method.refs" defaultValue="false"
+                 description="Use the compiling evaluator for the code with method references"/>
+    <registryKey key="debugger.async.smart.step.into" defaultValue="true"
+                 description="Smart step into anonymous class methods in any thread"/>
+    <registryKey key="debugger.monitor.blocked.threads" defaultValue="true"
+                 description="Watch if a thread we do stepping in is blocked by another suspended thread"/>
+    <registryKey key="debugger.check.source" defaultValue="true"
+                 description="Check that the source code matches the bytecode"/>
   </extensions>
 
   <actions>
diff --git a/java/java-analysis-impl/resources/META-INF/JavaAnalysisPlugin.xml b/java/java-analysis-impl/resources/META-INF/JavaAnalysisPlugin.xml
index cb39d6bec9aa..65c902067cc4 100644
--- a/java/java-analysis-impl/resources/META-INF/JavaAnalysisPlugin.xml
+++ b/java/java-analysis-impl/resources/META-INF/JavaAnalysisPlugin.xml
@@ -84,6 +84,10 @@
     <java.elementFinder implementation="com.intellij.psi.impl.PackagePrefixElementFinder"/>
     <daemon.changeLocalityDetector implementation="com.intellij.codeInsight.daemon.impl.JavaChangeLocalityDetector"/>
     <customScopesProvider implementation="com.intellij.analysis.PackagesScopesProvider" order="first,after default"/>
+    <registryKey key="ide.dfa.time.limit.online" defaultValue="1000"
+                 description="Time limit (in milliseconds) that is allowed to analyze data flow for one method"/>
+    <registryKey key="ide.dfa.report.imprecise" defaultValue="false"
+                 description="Whether to report methods for which data flow analysis was imprecise"/>
     <applicationService serviceInterface="com.intellij.codeInspection.BatchSuppressManager"
                         serviceImplementation="com.intellij.codeInspection.BatchSuppressManagerImpl"/>
     <applicationService serviceInterface="com.intellij.codeInspection.SuppressManager"
@@ -299,6 +303,8 @@
                  description="If a method result is a call to a @Nullable method, reports the caller as @Nullable as well"/>
     <registryKey key="java.annotations.inference.aggressive.hardcoded.purity" defaultValue="true" restartRequired="true"
                  description="Assume any implementation of methods like Object.toString() or Iterable.iterator() to be pure during bytecode inference. This assumption might lead to false-positives in some inspections, though it's believed to uncover more bugs."/>
+    <registryKey key="idea.report.nullity.missing.in.generated.overriders" defaultValue="true"
+                 description="Whether &quot;@NotNull/@Nullable problems&quot; inspection should complain about overriding methods or parameters missing @NotNull, which occur in generated code"/>
     <codeInsight.unresolvedReferenceQuickFixProvider implementation="com.intellij.codeInsight.daemon.impl.analysis.JavaFutureKeywordUseFixProvider"/>
     <codeInsight.unresolvedReferenceQuickFixProvider implementation="com.intellij.codeInsight.daemon.impl.analysis.SealedClassUnresolvedReferenceFixProvider"/>
     <lang.jvm.annotationPackageSupport implementation="com.intellij.codeInsight.annoPackages.JSpecifyAnnotationSupport"/>
diff --git a/java/java-impl/resources/META-INF/InspectionGadgets.xml b/java/java-impl/resources/META-INF/InspectionGadgets.xml
index 51008badacc1..a10f76e57642 100644
--- a/java/java-impl/resources/META-INF/InspectionGadgets.xml
+++ b/java/java-impl/resources/META-INF/InspectionGadgets.xml
@@ -2786,6 +2786,10 @@
                                  targetClass="com.siyeh.ig.format.StringFormatSymbolReferenceProvider$JavaFormatArgumentSymbol"/>
     <searcher forClass="com.intellij.find.usages.api.UsageSearchParameters"
               implementationClass="com.siyeh.ig.format.StringFormatUsageSearcher"/>
+
+    <registryKey key="ide.ignore.call.result.inspection.honor.inferred.pure"
+                 defaultValue="true"
+                 description="Whether inferred @Contract(pure=true) annotations should be taken into account in the &quot;Result of method call ignored&quot; inspection"/>
   </extensions>
 
 </idea-plugin>
diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml
index 636731b31932..b338385a4d34 100644
--- a/java/java-impl/resources/META-INF/JavaPlugin.xml
+++ b/java/java-impl/resources/META-INF/JavaPlugin.xml
@@ -312,6 +312,9 @@
     <notificationGroup id="JDK Arch Check" displayType="STICKY_BALLOON" bundle="messages.JavaBundle" key="notification.group.arch.checker"/>
     <notificationGroup id="Unsupported JDK" displayType="STICKY_BALLOON" bundle="messages.JavaBundle" key="notification.group.unsupported.jdk"/>
 
+    <registryKey key="editable.java.test.console" defaultValue="false"
+                 description="Enables System.in in java test consoles (JUnit &amp; TestNG)"/>
+
     <registryKey key="java.test.enable.tree.live.time" defaultValue="true"
                  description="Enable live time for tests" restartRequired="true"/>
 
@@ -345,6 +348,11 @@
     <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."/>
+    <registryKey key="compiler.ref.index" defaultValue="true" description="Enables Find Usages using references from compiler indices" restartRequired="true"/>
+    <registryKey key="compiler.ref.chain.search" defaultValue="true" description="Enables relevant method chain completion"/>
+
+    <registryKey key="enable.compiler.reference.index.test.actions" defaultValue="true"
+                 description="Enables compiler reference index test actions"/>
 
     <applicationService serviceInterface="com.intellij.execution.filters.ExceptionLineParserFactory"
                         serviceImplementation="com.intellij.execution.filters.ExceptionLineParserFactoryImpl"/>
@@ -1596,9 +1604,23 @@
                       bundle="messages.JavaBundle"/>
     <registryKey key="java.unused.symbol.strict.entry.points" defaultValue="true"
                  description="Do not consider implicit usages part of the entry points (editor only)"/>
+    <registryKey key="ide.unused.symbol.calculation.maxFilesToSearchUsagesIn" defaultValue="10"
+                 description="Max number of scanned files to find usages of a symbol"/>
+    <registryKey key="ide.unused.symbol.calculation.maxFilesSizeToSearchUsagesIn" defaultValue="524288"
+                 description="Max files size in bytes to find usages of a symbol in case there are a few files"/>
+    <registryKey key="ide.goto.symbol.include.overrides.on.qualified.patterns" defaultValue="true"
+                 description="Disable deduplication of methods from the same hierarchy if a qualified pattern is used in Goto Symbol"/>
     <registryKey defaultValue="false"
                  description="Use shallow unused declaration analysis in batch mode (like in the editor, Java only)"
                  key="java.unused.declaration.inspection.use.shallow.local.anaysis.as.global"/>
+    <registryKey key="introduce.variable.prefer.statements" defaultValue="false"
+                 description="If true, select the line at caret if there is no selection on the introduced variable; when false expressions chooser would be shown"/>
+    <registryKey key="add.past.participle.to.suggested.names" defaultValue="true"
+                 description="Past participle variants suggested when introducing variables"/>
+    <registryKey key="show.method.base.class.in.java.file.structure" defaultValue="true"
+                 description="Show the base class of a method in the Java File Structure view"/>
+    <registryKey key="ide.structural.navigation.visit.fields" defaultValue="false"
+                 description="Whether fields should be stopped at when navigating to the nex/previous structural member by Alt+Down/Up."/>
 
     <intentionAction>
       <language>JAVA</language>
diff --git a/java/java-psi-impl/resources/intellij.java.psi.impl.xml b/java/java-psi-impl/resources/intellij.java.psi.impl.xml
index a5e12a5296e5..f4f6b5a6859e 100644
--- a/java/java-psi-impl/resources/intellij.java.psi.impl.xml
+++ b/java/java-psi-impl/resources/intellij.java.psi.impl.xml
@@ -171,6 +171,10 @@
     <registryKey key="java.folding.icons.for.control.flow"
                  defaultValue="true"
                  description="Add folding icons to the gutter for control flow statements"/>
+    <registryKey key="unsound.capture.conversion.java.spec.change" defaultValue="false"
+                 description="Capture in method reference return type is unsound, and the spec would be changed, see https://bugs.openjdk.org/browse/JDK-8170887"/>
+    <registryKey key="ide.goto.implementation.show.interfaces" defaultValue="true"
+                 description="Whether to show sub-interfaces when invoking the 'Go to Implementation' action (Ctrl+Alt+B) on an interface."/>
   </extensions>
 
   <extensions defaultExtensionNs="org.jetbrains.uast">
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 36662cb8aa48..9936d6272f7f 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -575,11 +575,6 @@ ide.dumb.mode.check.awareness.description=Filter out non-DumbAware activities in
 ide.run.blocking.cancellable.assert.in.tests=false
 ide.run.blocking.cancellable.assert.in.tests.description=Implement assertions within 'runBlockingCancellable' in tests
 
-ide.unused.symbol.calculation.maxFilesToSearchUsagesIn=10
-ide.unused.symbol.calculation.maxFilesToSearchUsagesIn.description=Max number of scanned files to find usages of a symbol
-ide.unused.symbol.calculation.maxFilesSizeToSearchUsagesIn=524288
-ide.unused.symbol.calculation.maxFilesSizeToSearchUsagesIn.description=Max files size in bytes to find usages of a symbol in case there are a few files
-
 ide.tabbedPane.dragOutMultiplier=0.1
 ide.tabbedPane.dragOutMultiplier.description=A threshold to define if editor tab drag&drop is intentional (ratio of tab size)
 ide.tabbedPane.dragToSplitRatio=0.2
@@ -644,87 +639,15 @@ debugger.mayBringDebuggeeWindowToFrontAfterResume.description=Bring the debuggee
 # currently enabled only in Rider
 debugger.mayBringDebuggeeWindowToFrontAfterResume.supported=false
 debugger.mayBringDebuggeeWindowToFrontAfterResume.supported.description=State of the "Bring debuggee to foreground" feature
-debugger.batch.evaluation=true
-debugger.batch.evaluation.description=Evaluate multiple values in a single batch request to the debuggee
-debugger.batch.evaluation.force=false
-debugger.batch.evaluation.force.description=Force batch evaluation even when individual evaluation is possible
-
-debugger.compiling.evaluator.magic.accessor=false
-debugger.compiling.evaluator.magic.accessor.description=Allow access to private members via generated accessor methods in the compiling evaluator
-debugger.compiling.evaluator.reflection.access.with.java8=true
-debugger.compiling.evaluator.reflection.access.with.java8.description=Allow reflective access in the compiling evaluator compatible with Java 8 rules
-debugger.compiling.evaluator.extract.generated.class=true
-debugger.compiling.evaluator.extract.generated.class.description=Extract the generated class to a separate file \
-  (only for java versions lower than 11)
-debugger.compiling.evaluator.method.refs=false
-debugger.compiling.evaluator.method.refs.description=Use the compiling evaluator for the code with method references
 
 debugger.watches.in.variables=true
 debugger.watches.in.variables.description=Show the Watches node inside the Variables view
-debugger.auto.fetch.icons=true
-debugger.auto.fetch.icons.description=Automatically request icons for objects shown in debugger views when available
 debugger.close.dialog.on.navigate=true
 debugger.close.dialog.on.navigate.description=Close the Evaluate dialog on Jump to (type) source action
-debugger.async.smart.step.into=true
-debugger.async.smart.step.into.description=Smart step into anonymous class methods in any thread
-debugger.monitor.blocked.threads=true
-debugger.monitor.blocked.threads.description=Watch if a thread we do stepping in is blocked by another suspended thread
-debugger.check.source=true
-debugger.check.source.description=Check that the source code matches the bytecode
 debugger.click.disable.breakpoints=false
 debugger.click.disable.breakpoints.description=Use a single click to disable a breakpoint, a middle-button click to remove
-debugger.renderers.file=true
-debugger.renderers.file.description=Enable file object renderer
-debugger.renderers.arrays=true
-debugger.renderers.arrays.description=Show the first elements for primitive and string arrays
-debugger.renderers.arrays.max.primitives=100
-debugger.renderers.arrays.max.primitives.description=Number of primitive values to show
-debugger.renderers.arrays.max.strings=5
-debugger.renderers.arrays.max.strings.description=Number of string values to show
-debugger.single.smart.step.force=true
-debugger.single.smart.step.force.description=Do force step-into on a single variant smart step-into
-debugger.method.breakpoints.entry.default=true
-debugger.method.breakpoints.entry.default.description=Stop only on method entry by default
-debugger.emulate.method.breakpoints=true
-debugger.emulate.method.breakpoints.description=Emulate method breakpoints with line breakpoints by default
-debugger.intern.string.literals=false
-debugger.intern.string.literals.description=Make string literal refer to the same instance of class String
-debugger.capture.points.agent.debug=false
-debugger.capture.points.agent.debug.description=Enable debug logging for capture points agent
-debugger.collection.breakpoint.agent.debug=false
-debugger.collection.breakpoint.agent.debug.description=Enable debug logging for collection breakpoints agent
-debugger.capture.points.agent.annotations=true
-debugger.capture.points.agent.annotations.description=Enable reading capture points from annotations
-debugger.collection.watchpoints.enabled=false
-debugger.collection.watchpoints.enabled.description=Enable collection watchpoints support
-debugger.async.stacks.coroutines=true
-debugger.async.stacks.coroutines.description=Enable async stack traces for coroutines
-debugger.async.stacks.flows=true
-debugger.async.stacks.flows.description=Enable async stack traces for MutableSharedFlow
-debugger.async.stacks.state.flows=true
-debugger.async.stacks.state.flows.description=Enable async stack traces for MutableStateFlow
-debugger.async.stacks.max.depth=500
-debugger.async.stacks.max.depth.description=Maximum depth of captured async stacks
-debugger.log.async.stacks=false
-debugger.log.async.stacks.description=Log async stack trace when log stack trace is checked in breakpoint properties
-debugger.async.stack.trace.for.exceptions.printing=true
-debugger.async.stack.trace.for.exceptions.printing.description=Include async stack trace in exceptions' printed stack trace
 debugger.resume.yourkit.threads=true
 debugger.resume.yourkit.threads.description=Automatically resume YourKit profiler helper threads when debugging
-debugger.keep.step.requests=false
-debugger.keep.step.requests.description=Keep step requests active after a step completes (for advanced troubleshooting)
-debugger.enable.memory.view=true
-debugger.enable.memory.view.description=Enable the Memory view/tool window in the debugger
-debugger.enable.overhead.monitor=true
-debugger.enable.overhead.monitor.description=Enable the debugger overhead monitor to track evaluation cost
-debugger.memory.agent.debug=false
-debugger.memory.agent.debug.description=Enable debug logging to stdout from a memory agent
-debugger.memory.agent.debug.path=
-debugger.memory.agent.debug.path.description=Force the debugger to use the specified memory agent library instead of the bundled one (only for debugging purposes). Will be used only if debugger.memory.agent.debug checked
-debugger.memory.agent.action.timeout=-1
-debugger.memory.agent.action.timeout.description=Set debugger memory agent action timeout in millis
-debugger.memory.agent.use.in.memory.view=true
-debugger.memory.agent.use.in.memory.view.description=Use memory agent to estimate retained sizes in the Instances Window
 debugger.tree.states.depth=100
 debugger.tree.states.depth.description=Maximum depth for remembering expanded/collapsed state in debugger trees
 debugger.new.threads.view=false
@@ -743,63 +666,20 @@ debugger.toolbar.before.tabs=true
 debugger.toolbar.before.tabs.description=Show the debugger toolbar before tabs
 debugger.default.selected.view.key=Default
 debugger.default.selected.view.key.description=Selects which debugger view is shown by default (e.g., Variables, Console)
-debugger.track.instrumentation=true
-debugger.track.instrumentation.description=Track class instrumentation events during debugging
 debugger.variablesView.rss=true
 debugger.variablesView.rss.description=Enable node expanding in the Variables view speed search
 debugger.variablesView.rss.depth=4
 debugger.variablesView.rss.depth.description=Depth of search in the variables view
-debugger.attach.to.process.action=false
-debugger.attach.to.process.action.description=Show the "Attach to Process" action in the run/debug tool window
-debugger.sa.jdwp.debug=false
-debugger.sa.jdwp.debug.description=Enable additional JDWP debug logging for the shared agent
-debugger.add.rt.jar=true
-debugger.add.rt.jar.description=Add rt.jar to the classpath
-debugger.evaluate.single.threaded.timeout=1000
-debugger.evaluate.single.threaded.timeout.description=Number of milliseconds to evaluate resuming only the current thread, then resume all threads
-debugger.evaluate.load.helper.in.separate.classloader=false
-debugger.evaluate.load.helper.in.separate.classloader.description=Always load helper classes in a new classloader
-debugger.new.invocation.watcher=true
-debugger.new.invocation.watcher.description=When resuming all, take into account the debugger model state of contexts and their resumed threads
-debugger.retry.conditional.breakpoints=true
-debugger.retry.conditional.breakpoints.description=Retry to evaluate a condition in conditional breakpoints in the case of ObjectCollectedException
 debugger.call.tracing=false
 debugger.call.tracing.description=Enable call tracing in the debugger
-debugger.call.tracing.arguments=true
-debugger.call.tracing.arguments.description=Include method arguments in call tracing
-debugger.renderers.annotations=true
-debugger.renderers.annotations.description=Enable rendering values using annotations when available
 debugger.smart.step.inplace=true
 debugger.smart.step.inplace.description=Show smart step into options inline in the editor
 debugger.field.pin.to.top=true
 debugger.field.pin.to.top.description=Pin important fields to the top in the Variables view
-debugger.jb.jdi=true
-debugger.jb.jdi.description=Use the new forked JDI implementation
-debugger.async.jdi=true
-debugger.async.jdi.description=Use async JDI to speed up JDWP communication
-debugger.async.frames=true
-debugger.async.frames.description=Collect and show asynchronous call frames in stack traces
 debugger.library.frames.fold.instead.of.hide=true
 debugger.library.frames.fold.instead.of.hide.description=Fold library frames into a single placeholder instead of completely hiding them
-debugger.merge.pause.and.resume.description=Merge "Pause" and "Resume" buttons on the toolbar
-debugger.auto.attach.from.console=false
-debugger.auto.attach.from.console.description=Auto-attach to all processes available for debug from the console output
-debugger.auto.attach.from.any.console=false
-debugger.auto.attach.from.any.console.description=Auto-attach to all processes from any console output
-debugger.preload.event.info=true
-debugger.preload.event.info.description=Preload frequently used JDWP event info to reduce latency
-debugger.preload.types.async=true
-debugger.preload.types.async.description=Preload the list of loaded classes asynchronously to reduce latency
-debugger.preload.types.hierarchy=true
-debugger.preload.types.hierarchy.description=Request superclass and interfaces for each loaded class in advance to speed up further operations
-debugger.sync.commands.reschedule.delay=50
-debugger.sync.commands.reschedule.delay.description=Delay in milliseconds before rescheduling synchronous debugger commands to allow async tasks to finish; negative disables rescheduling
-debugger.sync.commands.max.retries=5
-debugger.sync.commands.max.retries.description=Maximum number of times a synchronous debugger command may be rescheduled
 debugger.attach.dialog.enabled=true
 debugger.attach.dialog.enabled.description=Show the new "Attach to Process" dialog instead of a popup
-debugger.stack.frame.show.code.index=false
-debugger.stack.frame.show.code.index.description=Show the bytecode index next to the line number for stack frames
 debugger.show.breakpoints.inline=true
 debugger.show.breakpoints.inline.description=Show breakpoints as inline inlays (e.g., before lambdas)
 debugger.show.breakpoints.inline.even.trivial=false
@@ -811,13 +691,9 @@ debugger.inlayRunToCursor.hover.area.description=The size of the hover area in t
 debugger.anti.flickering.delay=200
 debugger.anti.flickering.delay.description=Use an anti-flickering panel atop of the debugger variable tree and freeze repainting on specified ms \
   after stepping. Zero value means do not use an anti-flickering panel. Need to restart debug after setting it to zero and back.
-debugger.stop.on.graceful.exit=true
-debugger.stop.on.graceful.exit.description=Immediately detach the debugger when a process is about to terminate
 
 debugger.save.and.compare=false
 debugger.save.and.compare.description=Enable "Save & Compare" feature in the debugger
-debugger.show.offsets.in.frames=false
-debugger.show.offsets.in.frames.description=Show instruction offset in the frames view
 debugger.hotswap.floating.toolbar=true
 debugger.hotswap.floating.toolbar.description=Show a floating toolbar with a hot swap button on source change
 
@@ -1072,6 +948,7 @@ platform.random.idempotence.check.rate.description=Sets approximately once in ho
   recalculate a cached value to check if the result is equivalent. Set 0 to never perform such random checks. \
   Note that checks for values computed concurrently will still be performed.
 
+# suppress inspection "PluginKeysAreProhibitedInPlatformRegistry"
 java.max.package.name.length=1000
 java.max.package.name.length.description=An upper length limit on string that the IDE considers worth checking for being package names
 
@@ -1136,33 +1013,17 @@ ide.goto.rebuild.delay.description=How many milliseconds to wait before updating
 ide.goto.file.include.directories=true
 ide.goto.file.include.directories.description=Whether to include directories in Goto File even when the entered pattern contains no slashes (otherwise they're included anyway)
 
-ide.goto.symbol.include.overrides.on.qualified.patterns=true
-ide.goto.symbol.include.overrides.on.qualified.patterns.description=Disable deduplication of methods from the same hierarchy if a qualified pattern is used in Goto Symbol
-
-ide.structural.navigation.visit.fields=false
-ide.structural.navigation.visit.fields.description=Whether fields should be stopped at when navigating to the nex/previous structural member by Alt+Down/Up.
 
 ide.optimize.inspection.visitors=true
 ide.optimize.inspection.visitors.description=Whether to skip elements that are not suitable for a visitor during the inspections run
 
-ide.dfa.time.limit.online=1000
-ide.dfa.time.limit.online.description=Time limit (in milliseconds) that is allowed to analyze data flow for one method
 
 ide.dfa.state.limit=50000
 ide.dfa.state.limit.description=Maximal allowed number of instruction states analyzed by data flow for one method
 
-ide.dfa.report.imprecise=false
-ide.dfa.report.imprecise.description=Whether to report methods for which data flow analysis was imprecise
-
 ide.new.color.picker=true
 ide.new.color.picker.description=Popup-based non-modal color picker
 
-idea.report.nullity.missing.in.generated.overriders=true
-idea.report.nullity.missing.in.generated.overriders.description=Whether "@NotNull/@Nullable problems" inspection should complain about overriding methods or parameters missing @NotNull, which occur in generated code
-
-ide.ignore.call.result.inspection.honor.inferred.pure=true
-ide.ignore.call.result.inspection.honor.inferred.pure.description=Whether inferred @Contract(pure=true) annotations should be taken into account in the "Result of method call ignored" inspection
-
 ide.enable.toolwindow.stack=false
 ide.enable.toolwindow.stack.description=Remember which toolwindows were shown before the currently active one on the same side, and show them when the active one is hidden
 
@@ -1204,10 +1065,6 @@ floating.codeToolbar.verticalOffset.description=Vertical offset between line and
 floating.codeToolbar.showBelow=true
 floating.codeToolbar.showBelow.description=Always show the floating code toolbar below the selection when possible
 
-ide.goto.implementation.show.interfaces=true
-ide.goto.implementation.show.interfaces.description=Whether to show sub-interfaces when invoking the \
-  'Go to Implementation' action (Ctrl+Alt+B) on an interface.
-
 actionSystem.force.alt.gr=false
 actionSystem.force.alt.gr.description=Force treating AltGraph as Ctrl+Alt on Windows/Linux
 actionSystem.fix.alt.gr=true
@@ -1217,39 +1074,6 @@ completion.show.intention.icon.description=Show the intention (light bulb) icon
 always.show.intention.above.current.line=false
 always.show.intention.above.current.line.description=Avoid showing the intention popup on the line where the caret stays (e.g., show it above the current line)
 
-introduce.variable.prefer.statements=false
-introduce.variable.prefer.statements.description=If true, select the line at caret if there is no selection on the introduced variable; \
-  when false expressions chooser would be shown
-
-add.past.participle.to.suggested.names=true
-add.past.participle.to.suggested.names.description=Past participle variants suggested when introducing variables
-
-show.method.base.class.in.java.file.structure=true
-show.method.base.class.in.java.file.structure.description=Show the base class of a method in the Java File Structure view
-
-debugger.enable.breakpoints.during.evaluation=false
-debugger.enable.breakpoints.during.evaluation.description=Allow breakpoints to be hit while evaluating expressions
-
-debugger.run.suspend.helper=true
-debugger.run.suspend.helper.description=Run suspend helper by debug agent
-
-debugger.new.suspend.state.tracking=true
-debugger.new.suspend.state.tracking.description=Instead of making symmetrical suspend/resume operation, the end of operation returns the thread into the required state
-
-debugger.filter.breakpoints.during.stepping.using.debugger.engine=false
-debugger.filter.breakpoints.during.stepping.using.debugger.engine.description=When enabled, uses the old mechanism to disable all events in other threads during stepping via applying JDI thread filter
-
-debugger.filter.breakpoints.by.coroutine.id=true
-debugger.filter.breakpoints.by.coroutine.id.description=When enabled uses unique coroutine id to filter stepping
-
-debugger.how.to.switch.to.suspend.all=[IMMEDIATE_PAUSE*|PAUSE_WAITING_EVALUATION|METHOD_BREAKPOINT|DISABLE]
-debugger.how.to.switch.to.suspend.all.description=It is a way how the debugger engine will switch from suspend-thread context to suspend-all context
-
-coroutine.panel.live.update=false
-coroutine.panel.live.update.description=When enabled, Coroutine View will update its contents after every step. By default, the Coroutine View is collapsed after every step in favor of stepping performance.
-coroutine.panel.show.jobs.hierarchy=true
-coroutine.panel.show.jobs.hierarchy.description=When enabled, Coroutine View displays the hierarchy of coroutine jobs; otherwise, it shows coroutines grouped by dispatchers.
-
 wolf.the.problem.solver=true
 wolf.the.problem.solver.description=Disable 'global highlighting' to ease debug
 ui.disable.dimension.service.keys=false
@@ -1355,9 +1179,6 @@ ide.notification.visible.count.description=Max number of visible notifications
 ide.open.file.in.temp.project.dir=true
 ide.open.file.in.temp.project.dir.description=Enable file opening in the temp project directory
 
-embed.scene.builder=true
-embed.scene.builder.description=Show SceneBuilder embedded into an IntelliJ IDEA frame
-
 new.retina.detection=false
 new.retina.detection.description=New implementation to detect retina devices
 
@@ -1563,11 +1384,6 @@ idea.latching.scrolling.time.description=Maximum event lifetime in event series
 idea.latching.scrolling.angle=45.0
 idea.latching.scrolling.angle.description=Maximum vector angle decline from axis in degrees in event series (45 means no diagonal scrolling at all)
 
-decompiler.use.line.mapping=true
-decompiler.use.line.mapping.description=Maps original and decompiled line numbers when stepping in the debugger.
-decompiler.dump.original.lines=false
-decompiler.dump.original.lines.description=Show original line numbers as comments in decompiled text
-
 ide.transparency.mode.for.windows=false
 ide.transparency.mode.for.windows.description=Allow adding transparency to floating windows
 
@@ -1604,9 +1420,6 @@ error.stripe.gap.description=Minimal space between error stripe.
 editor.viewport.width.update.frequency=200
 editor.viewport.width.update.frequency.description=The minimum amount of preferred size changes per target amount of time that is considered to be frequent.
 
-unsound.capture.conversion.java.spec.change=false
-unsound.capture.conversion.java.spec.change.description=Capture in method reference return type is unsound, and the spec would be changed, see https://bugs.openjdk.org/browse/JDK-8170887
-
 lcd.contrast.value=0
 lcd.contrast.value.description=Set LCD text contrast value from 100 to 250
 
@@ -1667,9 +1480,6 @@ ide.tab.tooltip.module.description=Show the module name in the editor tab toolti
 darcula.fix.native.flickering=false
 darcula.fix.native.flickering.description=Fixes white flash on first window appearance
 
-terminal.persistent.tabs=true
-terminal.persistent.tabs.description=Save state of terminal tabs between IDE restarts
-
 string.value.max.number.of.strings=132
 string.value.max.number.of.strings.description=Limit for the number of different strings in StringValue
 
@@ -1851,18 +1661,6 @@ ide.structureView.StructureViewTreeStructure.BuildChildrenInBackground.descripti
 parallel.modules.loading=true
 parallel.modules.loading.description=Parallel modules loading
 
-compiler.ref.index=true
-compiler.ref.index.description=Enables Find Usages using references from compiler indices
-compiler.ref.index.restartRequired=true
-
-enable.compiler.reference.index.test.actions=true
-enable.compiler.reference.index.test.actions.description=Enables compiler reference index test actions
-
-compiler.ref.chain.search=true
-compiler.ref.chain.search.description=Enables relevant method chain completion
-
-editable.java.test.console=false
-editable.java.test.console.description=Enables System.in in java test consoles (junit & testng)
 
 ide.new.editor.tabs.vertical.borders=false
 ide.new.editor.tabs.vertical.borders.description=Whether to show vertical borders for editor tabs
@@ -2099,38 +1897,6 @@ toolwindow.open.tab.in.editor.description=Enables "Open in Editor Tab" action
 linux.kernel.variables.validate.every.time=true
 linux.kernel.variables.validate.every.time.description=Check that kernel variables required to run the profiler are set before every profiler start
 
-idea.profiler.hprof.autoload.snapshot.size=1000
-idea.profiler.hprof.autoload.snapshot.size.description=Enable snapshot analysis on-the-fly when hprof snapshot is less than the specified value in MB
-idea.profiler.hprof.show.objectAddress=false
-idea.profiler.hprof.show.objectAddress.description=Whether to attach the object snapshot's address in UI: tables, trees, etc.
-idea.profiler.hprof.show.objectAddress.restartRequired=true
-idea.profiler.hprof.show.duplicated.strings=true
-idea.profiler.hprof.show.duplicated.strings.description=Show the 'Duplicated Strings' tab in the Profiler Tool Window
-idea.profiler.hprof.show.duplicated.strings.restartRequired=false
-idea.profiler.kotlin.inline=true
-idea.profiler.kotlin.inline.description=Enable Kotlin inline functions support
-idea.profiler.attach.kotlin.inline=true
-idea.profiler.attach.kotlin.inline.description=Enable Kotlin inline functions support in the "attach" mode
-idea.profiler.merge.sleeping.samples=true
-idea.profiler.merge.sleeping.samples.description=Merge nearest sleeping execution samples with the same stack trace \
-  (Leads to lesser snapshot size, faster opening, and lesser memory consumption)
-idea.profiler.do.not.record.unused.events=true
-idea.profiler.do.not.record.unused.events.description=Do not record events that IDEA only shows as raw data under the Events tab \
-  (Leads to lesser snapshot size, faster opening, and lesser memory consumption)
-idea.profiler.folding.effectivelyOneChild.useJavaFilters=false
-idea.profiler.folding.effectivelyOneChild.useJavaFilters.description=Fold only those nodes that satisfy the same filtering criteria. \
-  (Preferences | Build, Execution, Deployment | Java Profiler | Filters)
-idea.profiler.folding.foldNonProjectNodes=true
-idea.profiler.folding.foldNonProjectNodes.description=Fold all nodes that don't belong to a project (overrides all other foldings)
-idea.profiler.flamegraph.tooltip.delay.millis=100
-idea.profiler.flamegraph.tooltip.delay.millis.description=Set delay for the tooltip to appear when hovering a new node after being hidden
-idea.profiler.flamegraph.tooltip.fast.movement.millis=33
-idea.profiler.flamegraph.tooltip.fast.movement.millis.description=Specify how fast a user should traverse nodes for the tooltip to hide
-idea.profiler.determine.actual.sampling.interval=true
-idea.profiler.determine.actual.sampling.interval.description=Determine a sampling interval as the average difference between sequential events in the snapshot
-idea.profiler.allocations.in.bytes=false
-idea.profiler.allocations.in.bytes.description=Show allocations in bytes (without conversion to kB/MB/GB)
-
 recent.locations.lines.before.and.after=2
 recent.locations.lines.before.and.after.description=Defines the number of lines that are shown before and after a recent location.
 
@@ -2416,9 +2182,6 @@ ide.debug.gutter.area.description=Shows gutter areas on hover
 ide.file.colors.at.left=false
 ide.file.colors.at.left.description=Paints file colors as stripe at left instead of the background
 
-ide.wsl.use_wsl_sync=true
-ide.wsl.use_wsl_sync.description=Use the WSL sync engine to copy data between Linux and Windows
-
 ide.heartbeat.delay=60000
 ide.heartbeat.delay.description=Delay before the heartbeat thread starts reporting performance data
 
diff --git a/plugins/java-decompiler/plugin/resources/META-INF/plugin.xml b/plugins/java-decompiler/plugin/resources/META-INF/plugin.xml
index 3018611dc748..78f3aa95078c 100644
--- a/plugins/java-decompiler/plugin/resources/META-INF/plugin.xml
+++ b/plugins/java-decompiler/plugin/resources/META-INF/plugin.xml
@@ -33,6 +33,15 @@
       groupKey="advanced.setting.group.decompiler"
     />
 
+    <registryKey
+      key="decompiler.use.line.mapping"
+      defaultValue="true"
+      description="Maps original and decompiled line numbers when stepping in the debugger."/>
+    <registryKey
+      key="decompiler.dump.original.lines"
+      defaultValue="false"
+      description="Show original line numbers as comments in decompiled text"/>
+
   </extensions>
 
   <applicationListeners>
diff --git a/plugins/javaFX/resources/intellij.javaFX.xml b/plugins/javaFX/resources/intellij.javaFX.xml
index e9f2aca565b5..48544dbc9d7a 100644
--- a/plugins/javaFX/resources/intellij.javaFX.xml
+++ b/plugins/javaFX/resources/intellij.javaFX.xml
@@ -108,6 +108,8 @@
 
     <registryKey key="javafx.fxml.controller.from.loader" defaultValue="false"
                  description="Resolve FXML controllers specified with FXMLLoader.setController()"/>
+    <registryKey key="embed.scene.builder" defaultValue="true"
+                 description="Show SceneBuilder embedded into an IntelliJ IDEA frame"/>
   </extensions>
 
   <projectListeners>
diff --git a/plugins/terminal/resources/META-INF/terminal.xml b/plugins/terminal/resources/META-INF/terminal.xml
index abd51727c434..a47a46cfbc2c 100644
--- a/plugins/terminal/resources/META-INF/terminal.xml
+++ b/plugins/terminal/resources/META-INF/terminal.xml
@@ -33,6 +33,9 @@
     <statistics.validation.customValidationRule implementation="org.jetbrains.plugins.terminal.fus.TerminalFocusRule"/>
     <statistics.applicationUsagesCollector implementation="org.jetbrains.plugins.terminal.fus.TerminalSettingsStateCollector"/>
 
+    <registryKey key="terminal.persistent.tabs" defaultValue="true"
+                 description="Save state of terminal tabs between IDE restarts"/>
+
     <registryKey key="terminal.Ctrl-E.opens.RecentFiles.popup" defaultValue="false"
                  description="Ctrl+E in terminal opens 'Recent Files' popup on Linux/Windows"/>