diff --git a/java/debugger/impl/resources/META-INF/java-debugger.xml b/java/debugger/impl/resources/META-INF/java-debugger.xml
index ccde48254eef..2aac46de309b 100644
--- a/java/debugger/impl/resources/META-INF/java-debugger.xml
+++ b/java/debugger/impl/resources/META-INF/java-debugger.xml
@@ -108,6 +108,7 @@
     <keymapExtension implementation="com.intellij.debugger.actions.DebuggerKeymapExtension"/>
 
     <xdebugger.settings implementation="com.intellij.debugger.settings.JavaDebuggerSettings"/>
+    <registryKey key="execution.java.always.debug" defaultValue="false" description="Always run java processes with the debug agent"/>
 
     <xdebugger.breakpointGroupingRule implementation="com.intellij.debugger.ui.XBreakpointGroupingByPackageRule"/>
     <xdebugger.breakpointGroupingRule implementation="com.intellij.debugger.ui.XBreakpointGroupingByClassRule"/>
@@ -219,6 +220,8 @@
                  description="The timeout between the hit run-to-cursor breakpoint in another thread/coroutine and pause the debugger"/>
     <registryKey key="debugger.run.to.cursor.waited.threads.limit" defaultValue="1"
                  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"/>
   </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 44c2aee521fa..9ec4a1693a12 100644
--- a/java/java-analysis-impl/resources/META-INF/JavaAnalysisPlugin.xml
+++ b/java/java-analysis-impl/resources/META-INF/JavaAnalysisPlugin.xml
@@ -365,5 +365,8 @@
     <referenceInjector implementation="com.intellij.microservices.jvm.url.HttpUrlReferenceInjector"/>
     <referenceInjector implementation="com.intellij.microservices.jvm.url.WSUrlReferenceInjector"/>
     <referenceInjector implementation="com.intellij.microservices.jvm.url.HttpMethodReferenceInjector"/>
+
+    <registryKey key="batch.inspections.ignored.jvm.languages" defaultValue="Groovy,Scala"
+                 description="Disable UAST processing for JVM languages; a comma separated list of UAST capable language ids."/>
   </extensions>
 </idea-plugin>
diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml
index 7c865a63cd7e..4a6fe53c3863 100644
--- a/java/java-impl/resources/META-INF/JavaPlugin.xml
+++ b/java/java-impl/resources/META-INF/JavaPlugin.xml
@@ -678,10 +678,6 @@
                          implementationClass="com.intellij.codeInsight.hint.NextParameterAfterCompletionHandler"/>
     <compiler.updateResourcesBuildContributor implementation="com.intellij.compiler.impl.JavaResourcesBuildContributor"/>
 
-    <!--<expectedTypesProvider implementation="com.intellij.codeInsight.JavaExpectedTypesProvider"/>-->
-
-
-
     <projectService serviceImplementation="com.intellij.execution.testDiscovery.JavaAutoRunManager"/>
     <registryKey defaultValue="true" description="Trigger autotest on delay instead of build events" key="trigger.autotest.on.delay"/>
 
@@ -811,6 +807,10 @@
     <applicationService serviceInterface="com.intellij.execution.vmOptions.VMOptionsService"
                         serviceImplementation="com.intellij.execution.vmOptions.VMOptionsServiceImpl"/>
 
+    <registryKey key="ide.jvm.run.marker" defaultValue="false" description="Enable JVM-lang-based run line markers"/>
+    <registryKey key="ide.jvm.command.line.clear.all.environments" defaultValue="true"
+                 description="Clear all environments when running a JVM command line application"/>
+
     <runDashboardCustomizer implementation="com.intellij.execution.CommonJavaRunDashboardCustomizer" id="commonJavaCustomizer"/>
 
     <warmupConfigurator implementation="com.intellij.ide.warmup.JdkWarmupConfigurator"/>
@@ -2785,12 +2785,19 @@
     <registryKey key="java.completion.methods.use.tags"
                  defaultValue="true"
                  description="Use additional tags for methods for completion"/>
+    <registryKey key="ide.java.completion.suggest.static.after.instance"
+                 defaultValue="false"
+                 description="Suggest static methods/fields after instance qualifier in Java completion"/>
 
     <registryKey key="java.create.compact.source.file.separately"
                  defaultValue="true"
                  description="Show 'Create java compact file' separately from all other classes"/>
 
     <virtualFileCustomDataProvider implementation="com.intellij.ide.JavaCodeStyleSettingsCustomDataSynchronizer"/>
+
+    <registryKey key="compiler.external.javac.keep.alive.timeout" defaultValue="300000"
+                 description="If not used for the specified period of time or longer, the IDE will shut down the cached javac compilation process"/>
+    <registryKey key="compiler.build.can.use.eel" defaultValue="true" description="Allow using Eel API to run build processes"/>
   </extensions>
 
   <extensions defaultExtensionNs="org.jetbrains">
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 246deafc97e6..0ff96cb3a120 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -35,12 +35,19 @@ actionSystem.playback.typecommand.delay=200
 actionSystem.playback.typecommand.delay.description=Delay after typing and shortcut related commands\
   \ being executed by the playback runner.
 actionSystem.playback.useDirectActionCall=true
+actionSystem.playback.useDirectActionCall.description=Invoke actions directly instead of dispatching input events during test playback
 actionSystem.playback.useTypingTargets=true
+actionSystem.playback.useTypingTargets.description=Send typing events to typing targets during playback
 actionSystem.keyGestures.enabled=false
+actionSystem.keyGestures.enabled.description=Enable key gesture shortcuts (multi-stroke) handling
 actionSystem.suspendFocusTransferIfApplicationInactive=true
+actionSystem.suspendFocusTransferIfApplicationInactive.description=Suspend focus transfers when the application is inactive
 actionSystem.getContextByRecentMouseEvent=false
+actionSystem.getContextByRecentMouseEvent.description=Get DataContext based on the most recent mouse event
 actionSystem.secondKeystrokeTimeout=2000
+actionSystem.secondKeystrokeTimeout.description=Timeout in milliseconds to wait for the second keystroke of a multi-stroke shortcut
 actionSystem.win.suppressAlt=true
+actionSystem.win.suppressAlt.description=Suppress native Alt key menu activation on Windows
 
 actionSystem.update.actions.async.max.nested.loops=20
 actionSystem.update.actions.async.max.nested.loops.description=A maximum number of nested EDT loops
@@ -65,7 +72,9 @@ action.toolbar.position.bottom.on.mac=false
 action.toolbar.position.bottom.on.mac.description=Moves the action toolbar to the bottom of the corresponding component. Mac only!
 
 actionSystem.mouseGesturesEnabled=true
+actionSystem.mouseGesturesEnabled.description=Enable mouse gesture support for invoking actions
 actionSystem.assertFocusAccessFromEdt=true
+actionSystem.assertFocusAccessFromEdt.description=Assert that focus-related APIs are accessed on the EDT
 
 ide.highlighting.mode.essential=false
 ide.highlighting.mode.essential.description=Enable essential highlighting mode
@@ -124,9 +133,9 @@ ide.recent.files.tool.window.list=true
 ide.recent.files.tool.window.list.description=Shows a list of tool windows in the Recent Files popup
 
 ide.new.tool.window.resize.area.height=13
-ide.new.tool.window.resize.area.height.description=Size of tool window header top part [1..26] reserved for resize (while the bottom part is for drag-n-drop)
+ide.new.tool.window.resize.area.height.description=Size of the tool window header top part [1..26] reserved for resize (while the bottom part is for drag-n-drop)
 ide.new.tool.window.start.drag.deadzone=100
-ide.new.tool.window.start.drag.deadzone.description=Minimal distance from pressed point to start drag (and thus to avoid mistaken one)
+ide.new.tool.window.start.drag.deadzone.description=Minimal distance from the pressed point to start drag (and thus to avoid mistaken one)
 ide.switcher.tool.window.list=true
 ide.switcher.tool.window.list.description=Shows a list of tool windows in the Switcher popup
 ide.allow.tool.window.tabs.reorder=true
@@ -160,9 +169,9 @@ ide.navigate.to.recently.focused.editor.description=Use the last focused editor
   By default, navigation (e.g., from tool windows) goes to the main IDE window even if you work with editors in a separate window.
 
 ide.editor.max.pinned.tab.width=2000
-ide.editor.max.pinned.tab.width.description=Max width for pinned editor tab
+ide.editor.max.pinned.tab.width.description=Max width for a pinned editor tab
 ide.editor.tabs.interactive.pin.button=true
-ide.editor.tabs.interactive.pin.button.description=Unpin pinned editor tab when 'pin' button is clicked
+ide.editor.tabs.interactive.pin.button.description=Unpin the pinned editor tab when the 'pin' button is clicked
 ide.editor.tabs.show.fadeout=true
 ide.editor.tabs.show.fadeout.description=Show fadeout overlay to decorate partially hidden (scrolled aside) tabs
 ide.editor.tabs.fadeout.width=10
@@ -172,15 +181,15 @@ ide.editor.tabs.visible.in.presentation.mode.description=Keep editor tabs visibl
 
 ide.hide.excluded.files=false
 ide.hide.excluded.files.restartRequired=true
-ide.hide.excluded.files.description=Do not show excluded files in Project View and exclude them from VCS
+ide.hide.excluded.files.description=Do not show excluded files in the Project View and exclude them from VCS
 
 use.tty.for.external.tools=false
-use.tty.for.external.tools.description=Use command line with TTY support to run 'External Tools'
+use.tty.for.external.tools.description=Use the command line with TTY support to run 'External Tools'
 
 ide.appIcon.badge=true
 ide.appIcon.requestAttention=true
 ide.appIcon.requestAttention.after.indexing=false
-ide.appIcon.requestAttention.after.indexing.description=Whether IDE should request user's attention (e.g., by flashing application icon on taskbar) after the end of project analysis
+ide.appIcon.requestAttention.after.indexing.description=Whether IDE should request user's attention (e.g., by flashing the application icon on the taskbar) after the end of project analysis
 
 win.request.focus.delay.ms=20
 win.request.focus.delay.ms.description=Time to wait (blocking EDT) before trying to activate the IDE window on Windows. The value around \
@@ -191,7 +200,7 @@ ide.index.image.max.size=10
 ide.index.image.max.size.description=Max size of an image to index, in megabytes
 
 no.window.actions.in.editor=false
-no.window.actions.in.editor.description=Disables window actions "Stretch to\u2026" within focused editor as before.
+no.window.actions.in.editor.description=Disables window actions "Stretch to\u2026" within the focused editor as before.
 
 ide.windowSystem.hScrollChars=5
 ide.windowSystem.vScrollChars=5
@@ -199,20 +208,30 @@ ide.windowSystem.autoShowProcessPopup=false
 ide.windowSystem.showListItemsPopup=true
 
 ide.tree.yieldingUiUpdate=true
+ide.tree.yieldingUiUpdate.description=Perform heavy tree UI updates in yielding mode to keep the UI responsive at the cost of longer updates
 ide.tree.showBusyIndicator=true
+ide.tree.showBusyIndicator.description=Show a busy/loading indicator in tree controls while data is being loaded or updated
 ide.tree.waitForReadyTimeout=250
+ide.tree.waitForReadyTimeout.description=Maximum time in milliseconds to wait for a tree to become ready before proceeding
 
 ide.tree.clearOnHideTime.description=Time in milliseconds when the hidden project view tree will be deactivated.
 
 ide.tree.autoscrollToVCenter=false
+ide.tree.autoscrollToVCenter.description=Automatically scroll the selected tree node to the vertical center of the visible area
 ide.tree.horizontal.default.autoscrolling=true
 ide.tree.horizontal.default.autoscrolling.description=Allow automatic horizontal scroll of selected tree nodes to visible area in tree views
 ide.tree.ensureSelectionOnFocusGained=true
+ide.tree.ensureSelectionOnFocusGained.description=Ensure that a tree has a valid selection when it gains focus
 ide.tree.autoExpandMaxDepth=5
+ide.tree.autoExpandMaxDepth.description=Maximum depth of nodes to auto-expand in trees
 ide.tree.expandRecursionDepth=50
+ide.tree.expandRecursionDepth.description=Maximum recursion depth when expanding tree nodes programmatically
 ide.tree.checkStructure=false
+ide.tree.checkStructure.description=Enable additional consistency checks for tree structure updates (may impact performance)
 ide.tree.uiLockAttempt=250
+ide.tree.uiLockAttempt.description=Maximum time in milliseconds to attempt to acquire the UI lock for tree updates before yielding
 ide.tree.deferred.icon.invalidates.cache=true
+ide.tree.deferred.icon.invalidates.cache.description=Whether a change in a deferred icon should invalidate the renderer cache for the corresponding tree node
 ide.tree.expand.on.double.click=[DEFAULT*|ALWAYS|NEVER|NAVIGATABLE]
 ide.tree.expand.on.double.click.description=Specify the default behavior of expanding/collapsing tree nodes by double-clicking (see ExpandOnDoubleClick enum)
 ide.tree.additional.rows.count=1
@@ -224,7 +243,7 @@ ide.rich.cancellation.traces.description=Enables detailed stacktrace collection
 edit.source.on.enter.key.disabled=false
 edit.source.on.enter.key.disabled.description=Allows preventing navigation on the Enter key pressed
 edit.source.on.enter.key.non.source.navigation.enabled=false
-edit.source.on.enter.key.non.source.navigation.enabled.description=Allows navigation even if navigatable object cannot navigate to the editor
+edit.source.on.enter.key.non.source.navigation.enabled.description=Allows navigation even if a navigatable object cannot navigate to the editor
 
 ide.bookmark.show.all.breakpoints=false
 ide.bookmark.show.all.breakpoints.description=Shows every breakpoint in the Bookmarks tool window
@@ -236,12 +255,12 @@ ide.bookmark.mnemonic.chooser.cyclic.scrolling.allowed=true
 ide.bookmark.mnemonic.chooser.cyclic.scrolling.allowed.description=Allows cyclic scrolling in the Mnemonic Chooser
 
 ide.bookmark.mnemonic.chooser.always.above.gutter=false
-ide.bookmark.mnemonic.chooser.always.above.gutter.description=Always shows above editor's gutter if possible
+ide.bookmark.mnemonic.chooser.always.above.gutter.description=Always shows the above editor's gutter if possible
 
 ide.tree.ui.cyclic.scrolling.allowed=false
 ide.tree.ui.cyclic.scrolling.allowed.description=Enables cyclic scrolling in trees if the UISettings.getCycleScrolling is enabled
 ide.tree.painter.classic.compact=false
-ide.tree.painter.classic.compact.description=Enables the compact version of classic painter for tree control
+ide.tree.painter.classic.compact.description=Enables the compact version of the classic painter for tree control
 ide.tree.painter.compact.default=false
 ide.tree.painter.compact.default.description=Enables the default version of compact painter for tree control
 
@@ -253,7 +272,7 @@ ide.tree.ui.async.batch.size.description=Number of virtual files to process in o
 
 ide.tree.experimental.layout.cache=true
 ide.tree.experimental.layout.cache.restartRequired=true
-ide.tree.experimental.layout.cache.description=Use experimental tree layout cache for all trees
+ide.tree.experimental.layout.cache.description=Use the experimental tree layout cache for all trees
 ide.tree.experimental.layout.cache.debug=false
 ide.tree.experimental.layout.cache.debug.description=Enable debugging (slow!) for DefaultTreeLayoutCache
 
@@ -272,18 +291,26 @@ ide.main.menu.expand.horizontal=true
 ide.main.menu.expand.horizontal.description=Expand the hamburger menu horizontally (Windows and Linux only)
 
 ide.macos.main.menu.alignment.options=[Native*|Aligned|Aligned in group|No icons]
-ide.macos.main.menu.alignment.options.description="Native" - align menu items as macOS does, \
-  "Aligned" - align menu items vertically inside a group, \
-  "No icons" - hide icons
+ide.macos.main.menu.alignment.options.description="Native" \u2013 align menu items as macOS does, \
+  "Aligned" \u2013 align menu items vertically inside a group, \
+  "No icons" \u2013 hide icons
 ide.splitter.mouseZone=6
+ide.splitter.mouseZone.description=The size in pixels of the mouse resize zone around splitters
 
 ide.splitter.chooser.info.panel.height=150
+ide.splitter.chooser.info.panel.height.description=Specifies the height of the Splitter chooser info panel in pixels
 ide.splitter.chooser.info.panel.width=250
+ide.splitter.chooser.info.panel.width.description=Specifies the width of the Splitter chooser info panel in pixels
 ide.splitter.chooser.info.panel.arc=10
+ide.splitter.chooser.info.panel.arc.description=Specifies the corner arc radius (in pixels) for the info panel\u2019s rounded corners
 ide.splitter.chooser.info.panel.arrows.shift.center=-20
+ide.splitter.chooser.info.panel.arrows.shift.center.description=Specifies the offset of the arrows from the panel center in pixels
 ide.splitter.chooser.info.panel.arrows.shift.vertical=20
+ide.splitter.chooser.info.panel.arrows.shift.vertical.description=Specifies the additional vertical offset for arrows inside the info panel in pixels
 ide.splitter.chooser.info.panel.arrows.shift.horizontal=30
+ide.splitter.chooser.info.panel.arrows.shift.horizontal.description=Specifies the additional horizontal offset for arrows inside the info panel in pixels
 ide.splitter.chooser.info.panel.text.shift=50
+ide.splitter.chooser.info.panel.text.shift.description=Specifies the offset of the text inside the info panel in pixels
 
 ide.autoscroll.to.source.delay=100
 ide.autoscroll.to.source.delay.description=Delay before performing the AutoscrollToSource action
@@ -307,13 +334,13 @@ ide.scroll.thumb.small.if.opaque=false
 ide.scroll.thumb.small.if.opaque.description=Allows tuning an opaque thumb thickness. Affects Windows and Linux only.
 
 ide.onboarding.background.enabled=true
-ide.onboarding.background.enabled.description=Enable background images for License, Import Settings and Update IDE screens dialogs.
+ide.onboarding.background.enabled.description=Enable background images for License, Import Settings, and Update IDE screens dialogs.
 
 ide.update.dialog.new.ui.enabled=false
 ide.update.dialog.new.ui.enabled.description=Enable the new UI for IDE Update Dialog
 
 ide.onboarding.background.use.long.timeout=true
-ide.onboarding.background.use.long.timeout.description=If true, long timeout (30 sec) for background images for License and Import Settings screens dialogs is used
+ide.onboarding.background.use.long.timeout.description=If true, the long timeout (30 sec) for background images for License and Import Settings screens dialogs is used
 
 mac.scroll.horizontal.gap=true
 mac.scroll.horizontal.gap.description=Shows additional space after the last row of a list or a tree. Affects macOS only.
@@ -328,25 +355,33 @@ ide.preferred.scrollable.viewport.fixed.height=0
 ide.preferred.scrollable.viewport.fixed.height.description=Specifies default row height for an empty list
 
 ide.preferred.scrollable.viewport.visible.rows=10
-ide.preferred.scrollable.viewport.visible.rows.description=Specifies default number of visible rows in a list
+ide.preferred.scrollable.viewport.visible.rows.description=Specifies the default number of visible rows in a list
 
 ide.preferred.scrollable.viewport.extra.space=true
 ide.preferred.scrollable.viewport.extra.space.description=Adds an extra space to show that a list can be scrolled
 
 ide.suvorov.progress.kind=[None|Bar|Spinning|Overlay|NiceOverlay*]
-ide.suvorov.progress.kind.description=Kind of progress that is used to make an impression of live IDE when it is freezed on acquisition of locks
+ide.suvorov.progress.kind.description=Kind of progress that is used to make an impression of a live IDE when it is freezed on acquisition of locks
 
 ide.suvorov.progress.showing.delay.ms=1000
-ide.suvorov.progress.showing.delay.ms.description=Defines delay until the UI component of progress indicator during a UI freeze starts being visible
+ide.suvorov.progress.showing.delay.ms.description=Defines delay until the UI component of the progress indicator during a UI freeze starts being visible
 
 ide.tooltip.animationCycle=150
+ide.tooltip.animationCycle.description=Duration in milliseconds for one animation cycle of tooltip animations.
 ide.tooltip.initialDelay=1200
+ide.tooltip.initialDelay.description=Delay in milliseconds before showing a tooltip after the pointer rests on a component.
 ide.tooltip.initialDelay.highlighter=150
+ide.tooltip.initialDelay.highlighter.description=Delay in milliseconds before showing editor highlighter tooltips.
 ide.tooltip.reshowDelay=500
+ide.tooltip.reshowDelay.description=Minimum time in milliseconds before a tooltip can be shown again after it was hidden.
 ide.tooltip.dismissDelay=4000
+ide.tooltip.dismissDelay.description=Time in milliseconds after which a visible tooltip is automatically hidden if the mouse stays idle.
 ide.tooltip.initialReshowDelay=500
+ide.tooltip.initialReshowDelay.description=Delay in milliseconds before showing a tooltip when moving within the same component.
 ide.tooltip.autoDismissDeadZone=300
+ide.tooltip.autoDismissDeadZone.description=Grace-period in milliseconds around auto\u2011dismiss to reduce flicker when the pointer is near the tooltip.
 ide.tooltip.showAllSeverities=false
+ide.tooltip.showAllSeverities.description=Show all inspection severities in editor tooltips instead of only the most relevant.
 ide.disable.editor.tooltips=false
 ide.disable.editor.tooltips.description=Prevents tooltips displayed in the editor (provided by inspections etc.)
 ide.balloon.shadowEnabled=true
@@ -369,10 +404,10 @@ gutter.tooltip.single.link.description=Shows a single link for all classes in a
 ide.helptooltip.regular.dismissDelay=10000
 ide.helptooltip.full.dismissDelay=30000
 ide.hide.expandable.tooltip.owner.mouse.exit=true
-ide.hide.expandable.tooltip.owner.mouse.exit.description=Provides autohiding for expandable tooltip when mouse leaves visible area of 'owner' component
+ide.hide.expandable.tooltip.owner.mouse.exit.description=Provides autohiding for expandable tooltip when the mouse leaves the visible area of the 'owner' component
 
 ide.expansion.hints.enabled=true
-ide.expansion.hints.enabled.description=Enables expansion hints for lists, trees, and tables to show invisible part of a cell renderer.
+ide.expansion.hints.enabled.description=Enables expansion hints for lists, trees, and tables to show the invisible part of a cell renderer.
 
 ide.browser.jcef.enabled=true
 ide.browser.jcef.enabled.restartRequired=true
@@ -391,14 +426,14 @@ ide.browser.jcef.markdownView.osr.enabled.description=Whether the Markdown view
 ide.browser.jcef.codeWithMe.osr.enabled=false
 ide.browser.jcef.codeWithMe.osr.enabled.description=Whether Code With Me should be displayed in the off-screen mode.
 ide.browser.jcef.codeWithMe.inBrowserScreenSharing.enabled=true
-ide.browser.jcef.codeWithMe.inBrowserScreenSharing.enabled.description=Start screen sharing in external browser.
+ide.browser.jcef.codeWithMe.inBrowserScreenSharing.enabled.description=Start screen sharing in an external browser.
 ide.browser.jcef.headless.enabled=false
 ide.browser.jcef.headless.enabled.description=Enable JCEF browser in the IDE headless mode
 ide.browser.jcef.testMode.enabled=false
 ide.browser.jcef.testMode.enabled.description=Allows for JBCefApp.getInstance() to re-initialize on a subsequent call.
 ide.browser.jcef.debug.port=-1
 ide.browser.jcef.debug.port.restartRequired=true
-ide.browser.jcef.debug.port.description=The port number at which remote DevTools will be available(0 - to select a random)
+ide.browser.jcef.debug.port.description=The port number at which remote DevTools will be available (0 \u2013 to select a random)
 ide.browser.jcef.preinit=false
 ide.browser.jcef.preinit.restartRequired=true
 ide.browser.jcef.preinit.description=Force JCEF init at IDE start-up to support co-existence with JavaFX (affects macOS only)
@@ -406,7 +441,7 @@ ide.browser.jcef.jsQueryPoolSize=0
 ide.browser.jcef.jsQueryPoolSize.description=Define JBCefJSQuery pool size used after browser creation
 ide.browser.jcef.gpu.disable=false
 ide.browser.jcef.gpu.disable.restartRequired=true
-ide.browser.jcef.gpu.disable.description=Disables GPU hardware acceleration in JCEF. If software renderer is not in place, then the GPU process won't launch.
+ide.browser.jcef.gpu.disable.description=Disables GPU hardware acceleration in JCEF. If a software renderer is not in place, then the GPU process won't launch.
 ide.browser.jcef.gpu.infinitecrash=true
 ide.browser.jcef.gpu.infinitecrash.restartRequired=true
 ide.browser.jcef.gpu.infinitecrash.description=Disables crash limit for a GPU process. If it crashes too often, then there will be shown a notification (which recommends disabling GPU).
@@ -450,14 +485,14 @@ editor.focus.mode.color.dark=404040
 editor.focus.mode.color.dark.description=Dark color for focus mode
 
 editor.position.mouse.cursor.on.doubleclicked.tab=false
-editor.position.mouse.cursor.on.doubleclicked.tab.description=Position mouse cursor on editor tab when the tab was double-clicked \
+editor.position.mouse.cursor.on.doubleclicked.tab.description=Position the mouse cursor on the editor tab when the tab was double-clicked \
   to perform 'Maximize Editor' or 'Hide All Tool Windows' actions
 
 editor.max.caret.count=1000
 editor.max.caret.count.description=Maximum number of carets that can be created in the editor (performance-related limit)
 
 editor.block.caret.selection.vim-like=false
-editor.block.caret.selection.vim-like.description=On mouse-drag selection in editor with block caret, always include character under caret \
+editor.block.caret.selection.vim-like.description=On mouse-drag selection in the editor with a block caret, always include character under caret \
   in selection
 
 editor.caret.update.primary.selection=true
@@ -467,16 +502,16 @@ editor.navigation.history.stack.size=150
 editor.navigation.history.stack.size.description=Stack size limit for back/forward and last/next edit location navigation
 
 editor.reformat.on.typing=false
-editor.reformat.on.typing.description=Enable the auto formatting typed handler
+editor.reformat.on.typing.description=Enable the auto-formatting typed handler
 editor.move.semicolon.after.paren=true
-editor.move.semicolon.after.paren.description=Moves semicolon typed before closing paren to the end of statement
+editor.move.semicolon.after.paren.description=Moves semicolon typed before closing paren to the end of the statement
 
 editor.virtual.lines=5
 editor.virtual.lines.description=Number of virtual empty lines displayed at the editor bottom
 
 editor.scrolling.animation.interval.ms=100
-editor.scrolling.animation.interval.ms.description=Animation interval (in milliseconds) for scrolling in the editor, when mouse is dragged \
-  beyond visible area. The smaller the value, the faster is scrolling.
+editor.scrolling.animation.interval.ms.description=Animation interval (in milliseconds) for scrolling in the editor, when the mouse is dragged \
+  beyond the visible area. The smaller the value, the faster is scrolling.
 
 editor.highlight.selected.text.max.occurrences.threshold=50
 editor.highlight.selected.text.max.occurrences.threshold.description=Maximum number of highlights in the editor when selecting text. \
@@ -489,13 +524,13 @@ editor.rd.reopen.editors.on.frontend.description=Enables reopening the editors o
   consequently, restoring the editor splitters
 
 highlight.caret.line.at.custom.fold=false
-highlight.caret.line.at.custom.fold.description=Whether caret line highlighting is applied when caret is located at a custom fold region
+highlight.caret.line.at.custom.fold.description=Whether caret line highlighting is applied when the caret is located at a custom fold region
 
 doc.render.cache.size=0.02
-doc.render.cache.size.description=Maximum fraction of available heap that will be used to store rendered comments (text content)
+doc.render.cache.size.description=Maximum fraction of the available heap that will be used to store rendered comments (text content)
 doc.render.cache.size.restartRequired=true
 doc.render.image.cache.size=0.04
-doc.render.image.cache.size.description=Maximum fraction of available heap that will be used to store (unpacked) images in rendered comments
+doc.render.image.cache.size.description=Maximum fraction of the available heap that will be used to store (unpacked) images in rendered comments
 doc.render.image.cache.size.restartRequired=true
 doc.render.adaptive.image=false
 doc.render.adaptive.image.description=Use the new experimental adaptive image loading
@@ -524,9 +559,9 @@ 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 symbol
+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 symbol in case there are a few files
+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)
@@ -534,7 +569,7 @@ ide.tabbedPane.dragToSplitRatio=0.2
 ide.tabbedPane.dragToSplitRatio.description=Ratio of editor tabs area to process drag-n-drop as vertical or horizontal split
 
 ide.warmup.use.predicates=true
-ide.warmup.use.predicates.description=Use predicate-based warmup instead of custom configuration-based one
+ide.warmup.use.predicates.description=Use predicate-based warmup instead of a custom configuration-based one
 
 file.chooser.async.tree.model=true
 file.chooser.async.tree.model.description=Use the new implementation based on AsyncTreeModel + FileTreeModel
@@ -575,31 +610,39 @@ ide.mac.pressAndHold.workaround=true
 ide.mac.pressAndHold.workaround.description=Enable workaround for press-and-hold input method for accented characters on macOS
 ide.mac.pressAndHold.brute.workaround=false
 ide.mac.pressAndHold.brute.workaround.description=Enable alternative workaround for press-and-hold input method for accented characters on macOS. \
-  It might work in more cases, but known to cause issues with Japanese text input.
+  It might work in more cases, but is known to cause issues with Japanese text input.
 
 debugger.valueTooltipAutoShow=true
 debugger.valueTooltipAutoShow.description=Auto show tooltip on mouse over.
 debugger.valueTooltipAutoShowOnSelection=false
 debugger.valueTooltipAutoShowOnSelection.description=Auto show tooltip when editor selection changes
 debugger.mayBringFrameToFrontOnBreakpoint=true
+debugger.mayBringFrameToFrontOnBreakpoint.description=Bring the IDE window to front when a breakpoint is hit
 debugger.mayBringDebuggeeWindowToFrontAfterResume=true
+debugger.mayBringDebuggeeWindowToFrontAfterResume.description=Bring the debuggee window to front after resume
 
 # currently enabled only in Rider
 debugger.mayBringDebuggeeWindowToFrontAfterResume.supported=false
-debugger.mayBringDebuggeeWindowToFrontAfterResume.supported.description=State of "Bring debuggee to foreground" feature
+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 generated class to a separate file \
+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
@@ -613,13 +656,13 @@ debugger.click.disable.breakpoints.description=Use a single click to disable a b
 debugger.renderers.file=true
 debugger.renderers.file.description=Enable file object renderer
 debugger.renderers.arrays=true
-debugger.renderers.arrays.description=Show first elements for primitive and string arrays
+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 single variant smart step-into
+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
@@ -627,9 +670,13 @@ debugger.emulate.method.breakpoints.description=Emulate method breakpoints with
 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
@@ -643,56 +690,49 @@ debugger.log.async.stacks.description=Log async stack trace when log stack trace
 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 memory agent
+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 bundled one (only for debugging purpose). Will be used only if debugger.memory.agent.debug checked
+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.kotlin.analysis.api.editor.text.provider=true
-debugger.kotlin.analysis.api.editor.text.provider.description=Use Analysis API-based implementation of 'EditorTextProvider'
-debugger.kotlin.inline.stack.trace.enabled=true
-debugger.kotlin.inline.stack.trace.enabled.description=Enable inline stack trace
-debugger.kotlin.show.coroutines.in.threadDumpPanel=true
-debugger.kotlin.show.coroutines.in.threadDumpPanel.description=Merge coroutine dump with thread dump in ThreadDumpPanel
-debugger.kotlin.auto.show.coroutines.view=false
-debugger.kotlin.auto.show.coroutines.view.description=Automatically open coroutines view if stack trace contains coroutine stack frames
 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.enable.kotlin.evaluator.in.java.context=false
-debugger.enable.kotlin.evaluator.in.java.context.description=Enable Kotlin evaluation features when hitting/suspending in Java frames \
-  (suggest Kotlin language in evaluation prompts, conditional breakpoints and "Evaluate and log" field; support Kotlin watches)
-debugger.kotlin.multiline.lambda.breakpoints=false
-debugger.kotlin.multiline.lambda.breakpoints.description=Allow installing breakpoint on multiline lambdas
-debugger.kotlin.report.smart.step.into.targets.detection.failure=true
-debugger.kotlin.report.smart.step.into.targets.detection.failure.description=Report an error when smart targets detection in bytecode failed (leads to a failure in tests)
-debugger.kotlin.step.through.inline.lambdas=true
-debugger.kotlin.step.through.inline.lambdas.description=Step over action steps into inline lambdas (e.g., calls of let/run/synchronized/...)
 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
+debugger.new.threads.view.description=Enable the experimental threads view in the debugger
 debugger.new.tool.window.layout=false
 debugger.new.tool.window.layout.restartRequired=true
-debugger.new.tool.window.layout.description=Enable new debugger UI (works only in the old UI)
+debugger.new.tool.window.layout.description=Enable the new debugger UI (works only in the old UI)
 debugger.new.tool.window.layout.toolbar=[After*|Vertical]
-debugger.new.tool.window.layout.toolbar.description=Change toolbar position in new debugger UI
+debugger.new.tool.window.layout.toolbar.description=Change toolbar position in the new debugger UI
 debugger.new.tool.window.layout.dnd=false
 debugger.new.tool.window.layout.dnd.restartRequired=true
 debugger.new.tool.window.layout.dnd.description=Enable drag and drop of the debugger tabs in the new debugger UI
 debugger.new.tool.window.layout.single.content=false
 debugger.new.tool.window.layout.single.content.description=Collapse the debug toolwindow header if there is only one active session
 debugger.toolbar.before.tabs=true
-debugger.toolbar.before.tabs.description=Show debugger toolbar before tabs
+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 variables view
+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
@@ -700,61 +740,61 @@ debugger.evaluate.single.threaded.timeout.description=Number of milliseconds to
 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 resume all, take into account the debugger model state of contexts and theirs resumed threads
+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 case of ObjectCollectedException
+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.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.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.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.max.retries=5
 debugger.attach.dialog.enabled=true
-debugger.attach.dialog.enabled.description=Show new "Attach to Process" dialog instead of popup
+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 bytecode index next to line number for stack frames
+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
-debugger.show.breakpoints.inline.even.trivial.description=Show inline inlay for line breakpoint even if it's the only breakpoint
+debugger.show.breakpoints.inline.even.trivial.description=Show inline inlay for a line breakpoint even if it's the only breakpoint
 debugger.report.non.default.inline.breakpoint=true
 debugger.report.non.default.inline.breakpoint.description=Report as an error scenario when a user adds a breakpoint via gutter and then enables another one in the same line
 debugger.inlayRunToCursor.hover.area=4
-debugger.inlayRunToCursor.hover.area.description=The size of hover area in the editor to show inlay Run-To-Cursor popup (counting in characters)
+debugger.inlayRunToCursor.hover.area.description=The size of the hover area in the editor to show the inlay Run-To-Cursor popup (counting in characters)
 debugger.anti.flickering.delay=200
 debugger.anti.flickering.delay.description=Use an anti-flickering panel atop of 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 debugger when process is about to terminate
+debugger.stop.on.graceful.exit.description=Immediately detach the debugger when a process is about to terminate
 
-rider.debugger.enable.collections.visualizers=true
-rider.debugger.enable.collections.visualizers.description=Enable a link next to a collection in local variable's pane and in a hint, which let explore the collection in a table view
-
-execution.java.always.debug=false
-execution.java.always.debug.description=Always run java processes with the debug agent
 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 frames view
-debugger.log.jdi.in.unit.tests=false
-debugger.log.jdi.in.unit.tests.description=Enable full JDI logging under DebugProcessImpl.LOG.debug for unit tests
+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
 
@@ -774,16 +814,16 @@ 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 build process to be run using the JDK specified. It is assumed that the jdk is at least of version 11.
+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 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.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 build port at which the build process will wait for debugger connections\n\
+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.
 
@@ -797,7 +837,7 @@ 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 to force automatically started builds to run in single-threaded mode even if 'Compile independent modules in parallel' is on\n\
+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
@@ -809,33 +849,26 @@ 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 compiler toolwindow.
-
-compiler.build.can.use.eel=true
-compiler.build.can.use.eel.description=Allow using Eel API to run build processes.
-
-compiler.external.javac.keep.alive.timeout=300000
-compiler.external.javac.keep.alive.timeout.description=If not used for the specified period of time or longer, the IDE will shut down the \
-  cached javac compilation process
+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 for reducing build time.
+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
-lvcs.open.diff.automatically.description=Open diff tab (if it is configured to be opened in the editor) when "Local History" tab is shown.
+lvcs.open.diff.automatically.description=Open the diff tab (if it is configured to be opened in the editor) when the "Local History" tab is shown.
 
 vcs.showConsole=true
-vcs.showConsole.description=Show 'Console' tab in VCS toolwindow that logs all write-commands performed by IDE.
+vcs.showConsole.description=Show the 'Console' tab in the VCS toolwindow that logs all write-commands performed by IDE.
 vcs.log.bek.sort.disabled=false
 vcs.log.bek.sort.disabled.description=Disable IntelliSort
 vcs.log.linear.bek.sort=false
-vcs.log.linear.bek.sort.description=Third kind of IntelliSort that simplifies merges and tries to show history as linear
+vcs.log.linear.bek.sort.description=A third kind of IntelliSort that simplifies merges and tries to show history as linear
 vcs.log.recent.commits.count=1000
 vcs.log.recent.commits.count.description=The number of recent commits is loaded to be shown quickly (before the full log is loaded, which can take some time)
 vcs.log.recent.commits.count.restartRequired=true
@@ -871,7 +904,7 @@ vcs.log.index.postpone.on.heavy.activity.or.power.save.description=Postpone Vcs
 vcs.log.index.durable.enumerator=true
 vcs.log.index.durable.enumerator.description=Use DurableEnumerator in the Vcs Log paths index instead of PersistentBTreeEnumerator.
 vcs.log.speedsearch=false
-vcs.log.speedsearch.description=Enable speedsearch in Log (warning: performance is not excellent)
+vcs.log.speedsearch.description=Enable speedsearch in the Log (warning: performance is not excellent)
 vcs.log.filter.messages.by.hash=true
 vcs.log.filter.messages.by.hash.description=Find hashes in commit messages when filtering by hash.
 vcs.log.copy.filters.to.new.tab=true
@@ -894,20 +927,20 @@ vcs.log.max.tags.shown.description=Limit for showing tags in the details panel.
 vcs.log.max.tags.shown.restartRequired=true
 vcs.log.use.indexed.details=false
 vcs.log.use.indexed.details.description=Load commit details directly from the index in the EDT thread. \
-  Enabling this key allows to load commit information in the Vcs Log instantly, but it may negatively affect table scrolling performance.
+  Enabling this key allows loading commit information in the Vcs Log instantly, but it may negatively affect table scrolling performance.
 vcs.log.git.committers.robots=
 vcs.log.git.committers.robots.description=Non-human git committers. E-mail addresses, comma delimited.
 vcs.log.git.committers.robots.restartRequired=true
 vcs.new.history=true
-vcs.new.history.description=Enable new file history that uses Log
+vcs.new.history.description=Enable the new file history that uses Log
 vcs.history.refine=true
 vcs.history.refine.description=Use a refining algorithm on file history that eliminates commits for different files having the same name.
 vcs.history.remove.trivial.merges=true
-vcs.history.remove.trivial.merges.description=Remove trivial merge commits from file history.
+vcs.history.remove.trivial.merges.description=Remove trivial merge commits from the file history.
 vcs.history.use.index=true
-vcs.history.use.index.description=Use index to show new file history
+vcs.history.use.index.description=Use index to show the new file history
 vcs.show.affected.files.as.tab=true
-vcs.show.affected.files.as.tab.description=Use 'Changes' toolwindow instead of dialogs for 'Show Affected Files' and similar actions
+vcs.show.affected.files.as.tab.description=Use the 'Changes' tool window instead of dialogs for 'Show Affected Files' and similar actions
 vcs.blame.show.affected.files.in.log=true
 vcs.blame.show.affected.files.in.log.description=Jump to the corresponding commit in the 'Log' view when clicking an entry in the 'Annotate with Git Blame' pane instead of opening a dialog with affected files.
 
@@ -926,12 +959,12 @@ vcs.root.auto.add.nofity=false
 vcs.root.auto.add.nofity.description=Display a notification that we detected and added some Git roots.
 
 vcs.enable.partial.changelists.persist.file.contents=false
-vcs.enable.partial.changelists.persist.file.contents.description=Persist file contents on disk to restore partial changes for files modified while IDE is closed
+vcs.enable.partial.changelists.persist.file.contents.description=Persist file contents on disk to restore partial changes for files modified while the IDE is closed
 vcs.enable.partial.changelists.undo=true
 vcs.enable.partial.changelists.undo.description=Restore original markers state on Undo action
 vcs.enable.partial.changelists.undo.restartRequired=true
 vcs.enable.partial.changelists.redo=false
-vcs.enable.partial.changelists.redo.description=Restore original markers state on Redo action
+vcs.enable.partial.changelists.redo.description=Restore the original markers state on Redo action
 vcs.enable.partial.changelists.redo.restartRequired=true
 
 vcs.force.non.modal.commit=false
@@ -941,10 +974,10 @@ vcs.disable.changelists.description=Disable tracking assigned changelists for Lo
 vcs.non.modal.commit.legend.compact=false
 vcs.non.modal.commit.legend.compact.description=Use compact commit legend presentation in Local Changes
 vcs.changes.tree.use.fixed.height.renderer=true
-vcs.changes.tree.use.fixed.height.renderer.description=Use faster fixed-height tree renderer for VCS trees
+vcs.changes.tree.use.fixed.height.renderer.description=Use a faster fixed-height tree renderer for VCS trees
 vcs.prefer.checkboxes.over.selection=false
-vcs.prefer.checkboxes.over.selection.description=Prefer changes checked with checkboxes over usual selection. \
-  Currently, it is only used for Rollback action.
+vcs.prefer.checkboxes.over.selection.description=Prefer changes checked with checkboxes over the usual selection. \
+  Currently, it is only used for the Rollback action.
 vcs.unversioned.files.max.intree=1000
 vcs.unversioned.files.max.intree.description=Maximum number of unversioned and ignored files displayed in the Local Changes file tree. \
   If there are more unversioned or ignored files, they are substituted with a link which opens a dialog.
@@ -952,8 +985,8 @@ vcs.code.author.inlay.hints=false
 vcs.code.author.inlay.hints.description=Show inlay hints with code author (based on vcs annotations) for classes, methods
 
 vcs.code.analysis.before.checkin.show.only.new.threshold=-1
-vcs.code.analysis.before.checkin.show.only.new.threshold.description=Show only newly introduced warnings and errors in results \
-   of before checkin analysis if the number of changed files is less or equals than the threshold
+vcs.code.analysis.before.checkin.show.only.new.threshold.description=Show only newly introduced warnings and errors in the results \
+   of before checkin analysis if the number of changed files is less or equal than the threshold
 
 vcs.code.analysis.before.checkin.check.unused.only.changed.properties=true
 vcs.code.analysis.before.checkin.check.unused.only.changed.properties.description=Perform the check if properties are used \
@@ -969,7 +1002,7 @@ vcs.process.externally.added.files.description=Process externally added files. \
 vcs.enable.add.ignored.directories.to.exclude=true
 vcs.enable.add.ignored.directories.to.exclude.description=Enables synchronization of ignored (but not excluded) directories with excluded directories on VCS ignored files rescan.
 vcs.propose.add.ignored.directories.to.exclude=true
-vcs.propose.add.ignored.directories.to.exclude.description=Show notification with a proposal to add ignored (but not excluded) directories to exclude.
+vcs.propose.add.ignored.directories.to.exclude.description=Show a notification with a proposal to add ignored (but not excluded) directories to exclude.
 
 vcs.resolve.symlinks.for.vcs.operations=prefer_target
 vcs.resolve.symlinks.for.vcs.operations.restartRequired=true
@@ -1009,7 +1042,7 @@ keymap.windows.as.meta=false
 keymap.windows.as.meta.description='Windows' key press/release events would be processed as 'Meta' modifier for shortcuts
 
 read.system.shortcuts=true
-read.system.shortcuts.description=Read system shortcuts and check conflicts with selected keymap
+read.system.shortcuts.description=Read system shortcuts and check conflicts with the selected keymap
 
 caches.scanningThreadsCount=-1
 caches.scanningThreadsCount.description=Specify the number of threads used for scanning files to index. -1 means the default value ("all available threads count" minus 1).
@@ -1024,13 +1057,13 @@ projectView.showHierarchyErrors=true
 projectView.hide.dot.idea=true
 
 projectView.show.base.dir=true
-projectView.show.base.dir.description=Include files from project's base dir even if they do not belong to any content root.
+projectView.show.base.dir.description=Include files from the project's base dir even if they do not belong to any content root.
 
 projectView.choose.directory.on.compacted.middle.packages=false
 projectView.choose.directory.on.compacted.middle.packages.description=Show "Choose destination directory" when creating a new file with a node selected that corresponds to multiple compacted packages
 
 projectView.always.show.inner.classes=false
-projectView.always.show.inner.classes.description=Shows inner classes in Project View even if Show Members is switched off
+projectView.always.show.inner.classes.description=Shows inner classes in the Project View even if Show Members is switched off
 
 show.live.templates.in.completion=true
 show.live.templates.in.completion.description=Show live templates in completion
@@ -1071,10 +1104,10 @@ documentation.component.highlighting.saturation.for.rendered.docs=65
 documentation.component.highlighting.saturation.for.rendered.docs.description=Allows reducing saturation of highlighting colors in documentation rendered view hints to lower distraction from the main code. Here 100 is the normal saturation (bright tones) and 0 is zero saturation (gray tones)
 
 documentation.show.toolbar=false
-documentation.show.toolbar.description=Show navigation toolbar in the documentation window
+documentation.show.toolbar.description=Show the navigation toolbar in the documentation window
 documentation.v2.tw.focus.invocation.timeout=500
 documentation.v2.tw.focus.invocation.timeout.description=How many milliseconds to wait for action invocation, which should focus the TW. \
-  When "Auto-Update from Source" is turned off, the action invocation will refresh the TW content without focusing the TW right away. \
+  When "Auto-Update from Source" is turned off, the action invocation will refresh the TW content without focusing on the TW right away. \
   During this timeout the subsequent action invocation will focus the TW. \
   When "Auto-Update from Source" is turned on, there is no need to invoke the action to refresh the TW content, \
   so the action invocation moves focus to the TW without the need for this timeout.
@@ -1090,7 +1123,7 @@ ide.completion.show.live.templates.on.top=false
 ide.completion.show.live.templates.on.top.description=In completion, show suitable live templates before other suggestions
 
 ide.lookup.preview.insertion=false
-ide.lookup.preview.insertion.description=Show preview of the approximate insertion result for the currently selected lookup suggestion.
+ide.lookup.preview.insertion.description=Show a preview of the approximate insertion result for the currently selected lookup suggestion.
 
 ide.completion.middle.matching=true
 ide.completion.middle.matching.description=Suggest items in completion that contain the entered string somewhere in the middle.
@@ -1102,14 +1135,11 @@ ide.completion.variant.limit=1000
 ide.completion.variant.limit.description=The completion list will never show a number of (most relevant) items >= this number
 
 ide.completion.max.width=99999
-ide.completion.max.width.description=Maximum width for completion popup in pixels. It can be used for making screenshots for blog posts and tweets.
+ide.completion.max.width.description=Maximum width for the completion popup in pixels. It can be used for making screenshots for blog posts and tweets.
 
 ide.completion.show.visibility.icon=false
 ide.completion.show.visibility.icon.description=Show member visibility type icon on the right of the base icon
 
-ide.java.completion.suggest.static.after.instance=false
-ide.java.completion.suggest.static.after.instance.description=Suggest static methods/fields after instance qualifier in Java completion
-
 ide.goto.middle.matching=true
 ide.goto.middle.matching.description=Suggest items in goto actions that contain the entered string somewhere in the middle.
 
@@ -1126,7 +1156,7 @@ 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 inspections run
+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
@@ -1144,7 +1174,7 @@ 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 "Result of method call ignored" inspection
+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
@@ -1177,7 +1207,7 @@ editor.loading.spinner.delay.ms=300
 editor.loading.spinner.delay.ms.description=Delay before the loading icon is shown if the editor is not shown (in milliseconds)
 
 refactorings.use.updated.conflicts.detected.dialog=true
-refactorings.use.updated.conflicts.detected.dialog.description=Show updated dialog when conflicts are detected during refactoring. Shows the old dialog when false.
+refactorings.use.updated.conflicts.detected.dialog.description=Show an updated dialog when conflicts are detected during refactoring. Shows the old dialog when false.
 
 ide.find.show.tooltip.in.preview=true
 ide.find.show.tooltip.in.preview.description=Show tooltip balloons in the find toolwindow preview when a tooltip is set for the usage
@@ -1185,20 +1215,22 @@ ide.find.show.tooltip.in.preview.description=Show tooltip balloons in the find t
 floating.codeToolbar.verticalOffset=2
 floating.codeToolbar.verticalOffset.description=Vertical offset between line and floating toolbar for code
 floating.codeToolbar.showBelow=true
-floating.codeToolbar.showBelow.description=Always show floating code toolbar below the selection when possible
+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
+actionSystem.fix.alt.gr.description=Work around layout-specific issues with AltGraph key handling
 completion.show.intention.icon=true
 always.show.intention.above.current.line=false
-always.show.intention.above.current.line.description=Avoid showing intention popup on the line where caret stays (e.g., show it above current line)
+always.show.intention.above.current.line.description=Avoid showing the intention popup on the line where caret stays (e.g., show it above current line)
 
 introduce.variable.prefer.statements=false
-introduce.variable.prefer.statements.description=If true, select line at caret if there is no selection on introduce; \
+introduce.variable.prefer.statements.description=If true, select the line at caret if there is no selection on introduce; \
   when false expressions chooser would be shown
 
 add.past.participle.to.suggested.names=true
@@ -1255,19 +1287,19 @@ ui.inspector.accessibility.audit.description=Show accessibility audit functional
 comment.by.line.bulk.lines.trigger=100
 
 diff.divider.repainting.disable.blitting=true
-diff.divider.repainting.disable.blitting.description=Fix painting glitch on scrolling in diff - disable BLIT_SCROLL_MODE to force repainting with RepaintManager
+diff.divider.repainting.disable.blitting.description=Fix the painting glitch on scrolling in diff - disable BLIT_SCROLL_MODE to force repainting with RepaintManager
 diff.divider.width=24
-diff.divider.width.description=Width of the divider area in side-by-side diff viewer
+diff.divider.width.description=Width of the divider area in the side-by-side diff viewer
 enable.patch.file.diff.viewer=true
-enable.patch.file.diff.viewer.description=Enable patch file viewer that allows to show changed files as a diff-like panel
+enable.patch.file.diff.viewer.description=Enable patch file viewer that allows showing changed files as a diff-like panel
 combined.diff.files.limit=1000
-combined.diff.files.limit.description=If the limit is reached, show simple diff instead "All in One Diff".\ Set "-1" to turn the limit off.
+combined.diff.files.limit.description=If the limit is reached, show the simple diff instead of "All in One Diff".\ Set "-1" to turn the limit off.
 combined.diff.loaded.content.limit=20
 combined.diff.loaded.content.limit.description=Max number of loaded files diff contents to keep.\ Set "-1" to turn limit off and keep contents only inside viewport (+ viewport.delta).
 combined.diff.visible.viewport.delta=3
-combined.diff.visible.viewport.delta.description=Set additionally number of blocks which need to be loaded before and beyond the viewport.
+combined.diff.visible.viewport.delta.description=Set additionally the number of blocks which need to be loaded before and beyond the viewport.
 show.diff.as.frame=false
-show.diff.as.frame.description=Always force diff in separate window frame implementation in places, where editor diff preview is not available. Overrides the "Open Diff as Editor Tab" action.
+show.diff.as.frame.description=Always force diff in a separate window frame implementation in places, where editor diff preview is not available. Overrides the "Open Diff as Editor Tab" action.
 show.diff.preview.as.editor.tab.with.single.click=false
 show.diff.preview.as.editor.tab.with.single.click.description=If enabled, and editor diff preview is used for Local Changes and Shelf, then \
   it is opened with single click.
@@ -1278,21 +1310,10 @@ blank.diff.history.max.memory.description=Amount of memory (approximate, order-o
 diff.external.tool.file.limit=20
 diff.external.tool.file.limit.description=Limit the opening of too many files in an external diff tool simultaneously
 diff.use.aggressive.text.file.detection=false
-diff.use.aggressive.text.file.detection.description=Ignore IDE 'File Types' setting when trying to show files in a diff viewer.
+diff.use.aggressive.text.file.detection.description=Ignore the IDE 'File Types' setting when trying to show files in a diff viewer.
 diff.unified.enable.imaginary.editor=true
 diff.unified.enable.imaginary.editor.description=Enable syntax highlighting in 'Unified Diff Viewer'
 
-jupyter.diff.viewer=true
-jupyter.diff.viewer.output=false
-jupyter.diff.viewer.output.description=Show outputs in the Jupyter diff viewer
-jupyter.diff.viewer.description=Implementation of diff tool for Jupyter Notebooks, which instead of diff for JSON shows a diff for notebook representations
-jupyter.merge.viewer=false
-jupyter.merge.viewer.description=Implementation of merge tool for Jupyter Notebooks, which helps to deal with conflicts during git activities
-jupyter.llm.autopilot=true
-jupyter.llm.autopilot.description=Enable Autopilot for Jupyter Notebooks
-dataspell.interpreter.widget=true
-dataspell.interpreter.widget.description=Interpreter widget for lightweight interpreter management
-
 llm.welcome.guide=true
 llm.welcome.guide.description=Enables Welcome Guide feature
 
@@ -1322,15 +1343,6 @@ ide.message.dialogs.as.swing.alert.show.title.bar.description=Show platform wind
 windows.jumplist=true
 windows.jumplist.description=Enables JumpLists on Windows
 
-# via ExternalSystemApiUtil.isInProcessMode
-# suppress inspection "UnusedProperty"
-GRADLE.system.in.process=true
-GRADLE.system.in.process.description=Whether IDEA should use 'in-process' mode for interaction with gradle api
-
-# via ExternalSystemApiUtil.isInProcessMode
-# suppress inspection "UnusedProperty"
-MAVEN.system.in.process=true
-MAVEN.system.in.process.description=Whether IDEA should use 'in-process' mode for interaction with maven api
 
 vcs.ignorefile.generation=false
 vcs.ignorefile.generation.description=Whether native VCS ignored files (e.g., .gitignore) are generated on first project open \
@@ -1345,7 +1357,7 @@ ide.notification.visible.count=2
 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 temp project directory
+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 IntelliJ IDEA frame
@@ -1357,10 +1369,10 @@ ide.scratch.buffers=5
 ide.scratch.buffers.description=Number of scratch buffer files
 
 project.tree.structure.show.url=true
-project.tree.structure.show.url.description=Show URL in the ProjectView nodes for project and libraries
+project.tree.structure.show.url.description=Show URL in the Project View nodes for a project and libraries
 
 ide.show.progress.without.status.bar=true
-ide.show.progress.without.status.bar.description=Disables transparent progress indicator when the status bar is switched off
+ide.show.progress.without.status.bar.description=Disables the transparent progress indicator when the status bar is switched off
 
 editor.injected.highlighting.enabled=true
 editor.injected.highlighting.enabled.description=Disables injected fragments highlighting (requires project reopening)
@@ -1374,7 +1386,7 @@ run.processes.with.pty=FALSE
 run.processes.with.pty.description=Allocate pseudo-terminal for running and debugging programs. \
   This affects the result of isatty() native call, which is usually consulted by various command-line tools \
   to check if they can operate in an interactive mode.\n\
-  Note that not all IDEs check this option and support PTY at all.\
+  Note that not all IDEs check this option and support PTY completely.\
   Currently, this option is used in CLion and PyCharm.
 
 run.processes.using.pty.helper.on.mac.intel=true
@@ -1384,7 +1396,7 @@ terminal.use.conpty.on.windows=true
 terminal.use.conpty.on.windows.description=Use ConPTY API to run processes with PTY on Windows
 
 run.processes.with.redirectedErrorStream=false
-run.processes.with.redirectedErrorStream.description=Merge processes standard streams (error and output). \
+run.processes.with.redirectedErrorStream.description=Merge standard streams of processes (error and output). \
   This makes it easier to correlate error messages with the corresponding output. \
   However, as a result, it won't be possible to distinguish between stdout and stderr. \
   This option is supported only for certain run/debug configurations. \
@@ -1411,9 +1423,9 @@ allow.dialog.based.popups.description=Allows using a JDialog as popup toplevel
 popup.resize.zone.macos=8
 popup.resize.zone.macos.description=The size of mouse resize zone on macOS
 popup.resize.zone.windows=4
-popup.resize.zone.windows.description=The size of mouse resize zone on Windows
+popup.resize.zone.windows.description=The size of the mouse resize zone on Windows
 popup.resize.zone.linux=4
-popup.resize.zone.linux.description=The size of mouse resize zone on Linux
+popup.resize.zone.linux.description=The size of the mouse resize zone on Linux
 
 popup.fix.ide.frame.owner=false
 popup.fix.ide.frame.owner.description=Use a correct owner for IdeFrame, but can break some popups
@@ -1432,10 +1444,10 @@ enable.rename.options.inplace=true
 enable.rename.options.inplace.description=Show search in comments/text occurrences as inlays in the editor
 
 ide.event.queue.dispatch.threshold=10
-ide.event.queue.dispatch.threshold.description=A positive number of milliseconds starts to measure time of event processing.
+ide.event.queue.dispatch.threshold.description=A positive number of milliseconds starts to measure the time of event processing.
 
 ide.settings.keymap.input.method.enabled=false
-ide.settings.keymap.input.method.enabled.description=Use input method instead of simple key event to enter shortcuts.
+ide.settings.keymap.input.method.enabled.description=Use an input method instead of a simple key event to enter shortcuts.
 
 ide.settings.configurable.loading.threshold=0
 ide.settings.configurable.loading.threshold.description=A positive number of milliseconds starts debugging of Settings loading.
@@ -1444,10 +1456,15 @@ ide.settings.replace.group.with.single.configurable=true
 ide.settings.replace.group.with.single.configurable.description=Used to generate a more compact tree for Settings/Preferences.
 
 ide.titled.border.top=7
+ide.titled.border.top.description=Top inset of titled borders (pixels)
 ide.titled.border.left=0
+ide.titled.border.left.description=Left inset of titled borders (pixels)
 ide.titled.border.right=0
+ide.titled.border.right.description=Right inset of titled borders (pixels)
 ide.titled.border.bottom=10
+ide.titled.border.bottom.description=Bottom inset of titled borders (pixels)
 ide.titled.border.indent=20
+ide.titled.border.indent.description=Horizontal indentation for titled border content (pixels)
 
 html.prefer.short.notation.of.boolean.attributes=true
 
@@ -1529,7 +1546,7 @@ idea.editor.smooth.scrolling.navigation.duration=100
 idea.editor.smooth.scrolling.navigation.duration.description=Change the duration of animated scrolling in the editor using Page Up/Page Down keys
 
 idea.latching.scrolling.enabled=true
-idea.latching.scrolling.enabled.description=When enabled, scroll sticks vertically or horizontally when precise scroll is on
+idea.latching.scrolling.enabled.description=When enabled, scroll sticks vertically or horizontally when the precise scroll is on
 idea.latching.scrolling.time=200
 idea.latching.scrolling.time.description=Maximum event lifetime in event series (ms)
 idea.latching.scrolling.angle=45.0
@@ -1583,13 +1600,13 @@ lcd.contrast.value=0
 lcd.contrast.value.description=Set LCD text contrast value from 100 to 250
 
 autocheck.availability.welcome.screen.projects=true
-autocheck.availability.welcome.screen.projects.description=Auto-checks recent projects availability in the Welcome screen
+autocheck.availability.welcome.screen.projects.description=Auto-checks recent projects' availability on the Welcome screen
 ide.find.use.search.in.selection.keyboard.shortcut.for.replace=false
 ide.find.use.search.in.selection.keyboard.shortcut.for.replace.description=Always use the keyboard shortcut for Search in Selection instead of the Replace keyboard shortcut when in Replace mode
 ide.find.word.based.preserve.case=true
 ide.find.word.based.preserve.case.description=New word-based preserve case implementation
 ide.find.max.rows=3
-ide.find.max.rows.description=Max rows to be shown in search and replace fields in 'Find in Files' / 'Replace in Files' popup and Find / Replace in editor
+ide.find.max.rows.description=Max rows to be shown in search and replace fields in the 'Find in Files' / 'Replace in Files' popup and Find / Replace in the editor
 ide.find.result.count.warning.limit=1000
 ide.find.result.count.warning.limit.restartRequired=true
 ide.find.result.count.warning.limit.description=The limit at which the "Too many results found" warning is shown
@@ -1604,15 +1621,15 @@ ide.find.select.word.at.caret.description=Select and find word at caret when the
 ide.find.escape.selected.text.for.regex=true
 ide.find.escape.selected.text.for.regex.description=Automatically escapes selected text for Find / Find in Files when the Regex option in ON
 ide.find.use.editor.font=false
-ide.find.use.editor.font.description=Switch search fields in editor and in 'Find in Files' to using editor font
+ide.find.use.editor.font.description=Switch search fields in the editor and in 'Find in Files' to using editor font
 ide.remove.help.button.from.dialogs=false
-ide.remove.help.button.from.dialogs.description=Removes help button from dialogs
+ide.remove.help.button.from.dialogs.description=Removes the help button from dialogs
 ide.find.in.file.highlight.usages=true
 ide.find.in.file.highlight.usages.description=Delegate FindUsagesInFile action to HighlightUsagesInFile
 ide.symbol.url.references=false
-ide.symbol.url.references.description=Symbol API based issue references
+ide.symbol.url.references.description=Symbol API-based issue references
 ide.rename.preview.dialog=false
-ide.rename.preview.dialog.description=Show preview dialog after Usage View
+ide.rename.preview.dialog.description=Show the preview dialog after Usage View
 ide.instant.theme.switch=true
 ide.instant.theme.switch.description=Switch theme in the quick switcher instantly, upon selection
 ide.instant.theme.switch.delay=500
@@ -1628,12 +1645,13 @@ ide.usages.popup.analyzing.indicator.enable=true
 ide.usages.popup.analyzing.indicator.enable.description=Show analyzing indicator in the show usages popup
 
 ide.ruler.guide.allowed.gap=2
-ide.ruler.guide.allowed.gap.description=Gap in pixels considered as an error in the layout
+ide.ruler.guide.allowed.gap.description=Gap in pixels that is considered as an error in the layout
 
 ide.debug.in.title=false
+ide.debug.in.title.description=Show the debug session name in the title bar
 
 ide.tab.tooltip.module=false
-ide.tab.tooltip.module.description=Show module name in editor tab tooltip
+ide.tab.tooltip.module.description=Show the module name in the editor tab tooltip
 
 darcula.fix.native.flickering=false
 darcula.fix.native.flickering.description=Fixes white flash on first window appearance
@@ -1642,10 +1660,10 @@ 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 number of different strings in StringValue
+string.value.max.number.of.strings.description=Limit for the number of different strings in StringValue
 
 search.everywhere.pattern.checking=true
-search.everywhere.pattern.checking.description=Avoid searching classes and symbols if pattern contains only one dot
+search.everywhere.pattern.checking.description=Avoid searching for classes and symbols if a pattern contains only one dot
 
 search.everywhere.fuzzy.file.search.enabled=false
 search.everywhere.fuzzy.file.search.enabled.description=Enable fuzzy file search
@@ -1657,7 +1675,7 @@ custom.folding.max.lookup.depth=50
 custom.folding.max.lookup.depth.description=Max lookup depth for custom folding comments in a PSI tree.
 
 project.structure.add.tools.jar.to.new.jdk=false
-project.structure.add.tools.jar.to.new.jdk.description=Automatically add tools.jar to 'Classpath' when new JDK is created
+project.structure.add.tools.jar.to.new.jdk.description=Automatically add tools.jar to 'Classpath' when a new JDK is created
 
 project.qualified.module.names=true
 project.qualified.module.names.description=Organize module nodes accordingly to their qualified (dot-separated) names
@@ -1666,17 +1684,9 @@ external.system.configuration.import.enabled=true
 external.system.configuration.import.enabled.description=Enable import of IntelliJ specific settings from an external build system
 external.system.auto.import.disabled=false
 external.system.auto.import.disabled.description=Disable auto-import build system model to idea
-gradle.auto.auto.jdk.fix.disabled=false
-gradle.auto.auto.jdk.fix.disabled.description=Disable attempt to fix unknown JDK in Gradle configuration on project open
 
 application.deactivation.timeout=1500
 
-android.gradle.project.startup.activity.disabled=false
-android.gradle.project.startup.activity.disabled.description = Disable gradle post-startup activity for Android projects
-
-android.sdk.local.properties.update.disabled=false
-android.sdk.local.properties.update.disabled.description=Disable update android sdk for local.properties
-
 editor.breadcrumbs.highlight.on.hover=false
 editor.breadcrumbs.highlight.on.hover.description=Highlight corresponding ranges in the editor on breadcrumb item hover (requires project reopening)
 
@@ -1727,7 +1737,7 @@ ide.new.run.config.junit.description=New JUnit Configuration UI
 select.run.configuration.from.context=true
 select.run.configuration.from.context.description=Select run configuration when run from context (gutter icon, popup menu)
 run.popup.move.folders.to.top=false
-run.popup.move.folders.to.top.description=Move folders in run popup to top or spread them by type groups
+run.popup.move.folders.to.top.description=Move folders in the run popup to the top or spread them by type groups
 run.popup.show.inlines.for.active.configurations=true
 run.popup.show.inlines.for.active.configurations.description=Always show inline Run/Debug actions for active configurations
 update.run.configuration.actions.from.cache=false
@@ -1735,22 +1745,22 @@ update.run.configuration.actions.from.cache.description=Disable run actions on t
 run.configuration.update.timeout=100
 run.configuration.update.timeout.description=The timeout in milliseconds for context run configuration actions to determine their applicability
 run.configuration.max.name.length=80
-run.configuration.max.name.length.description=When the name of run configuration exceeds the limit, it will be trimmed in UI like 'LongNamedRunCo...'
+run.configuration.max.name.length.description=When the name of the run configuration exceeds the limit, it will be trimmed in UI like 'LongNamedRunCo...'
 run.configuration.use.tree.popup.to.add.new=true
 run.configuration.use.tree.popup.to.add.new.description=Enables tree structure instead of a plain list in the "Add New Configuration" popup
 suggest.all.run.configurations.from.context=false
-suggest.all.run.configurations.from.context.description=With the option enabled, all run configuration from context will be suggested to\
+suggest.all.run.configurations.from.context.description=With the option enabled, all run configurations from context will be suggested to\
   run or create in spite of existing run configuration in the context
 run.current.file.item.in.run.configurations.combobox=false
-run.current.file.item.in.run.configurations.combobox.description=Adds 'Current File' item to the run configurations list in the combobox on the toolbar
+run.current.file.item.in.run.configurations.combobox.description=Adds the 'Current File' item to the run configurations list in the combobox on the toolbar
 allow.macros.for.run.configurations=true
 allow.macros.for.run.configurations.description=Enables context-dependent macros like $FileName$ or $SelectedText$ in Run Configurations
 lock.run.executor.for.before.run.tasks=false
-lock.run.executor.for.before.run.tasks.description=Locks execution of 'before run' tasks to standard 'run' executor (e.g., prevents debugging)
+lock.run.executor.for.before.run.tasks.description=Locks execution of 'before run' tasks to the standard 'run' executor (e.g., prevents debugging)
 focus.follows.mouse.workarounds=false
 focus.follows.mouse.workarounds.description=Enables some workarounds for Focus-follows-mouse issues, like IDEA-112015
 tests.view.node.expanding.search=true
-tests.view.node.expanding.search.description=Enable node expanding in tests view speed search
+tests.view.node.expanding.search.description=Enable node expanding in the tests view speed search
 test.view.hide.progress.bar.on.tests.finished=false
 test.view.hide.progress.bar.on.tests.finished.description=Hides the colored progress bar when tests have finished running
 
@@ -1760,19 +1770,6 @@ ide.enable.edt.lock.load.monitor.description=Enable monitoring of lock usage on
 ide.enable.edt.lock.load.fus.monitor=true
 ide.enable.edt.lock.load.fus.monitor.description=Enable monitoring of lock usage on EDT for reporting to FUS
 
-cidr.xcode.derived.data.override=true
-cidr.xcode.derived.data.override.restartRequired=true
-cidr.xcode.derived.data.override.description=Ignore Xcode DerivedData location settings
-appcode.always.use.xcodebuild=false
-appcode.always.use.xcodebuild.description=Force AppCode to always use xcodebuild tool for building
-appcode.simulator.debugger.launch.timeout=180
-appcode.simulator.debugger.launch.timeout.description=How long (in seconds) the debugger session should wait for the simulator to launch the process
-appcode.compiler.invocations.disk.cache=false
-appcode.compiler.invocations.disk.cache.description=Force AppCode to cache the result of compiler invocations on disk
-appcode.resolve.effective.platform=true
-appcode.resolve.effective.platform.restartRequired=true
-appcode.resolve.effective.platform.description=Enable resolving according to effective platform
-
 ide.text.effect.new=true
 ide.text.effect.new.description=Enables new effect painter for text
 highlighting.delay.invalid.psi.info.kill.ms=300
@@ -1805,9 +1802,6 @@ ide.remote.interpreters.rsync.enabled.on.windows=false
 ide.remote.interpreters.use.rsync=true
 ide.remote.interpreters.use.rsync.description=Use rsync utility to synchronize remote interpreters and local stubs
 
-javafx.fxml.controller.from.loader=false
-javafx.fxml.controller.from.loader.description=Resolve FXML controllers specified with FXMLLoader.setController()
-
 inplace.change.signature=false
 inplace.change.signature.description=Enables change signature without a dialog, inplace in the editor
 
@@ -1892,19 +1886,19 @@ document.async.commit.with.coroutines=true
 document.async.commit.with.coroutines.description=Enables the use of coroutines for asynchronous document commit. Non-modal commit will use background write action 
 
 document.save.in.background.allowed=true
-document.save.in.background.allowed.description=Allows saving documents in background
+document.save.in.background.allowed.description=Allows saving documents in the background
 
 filetype.reparse.with.coroutines=true
 filetype.reparse.with.coroutines.description=Whether to reparse files asynchronously with background write action
 
 file.system.trace.loading=/proc/cpuinfo
-file.system.trace.loading.description=Semicolon-separated paths that should not be loaded into IDE's file system. Their loading stack traces will be logged
+file.system.trace.loading.description=Semicolon-separated paths that should not be loaded into the IDE's file system. Their loading stack traces will be logged
 file.system.trace.loading.restartRequired=true
 
 ssr.template.from.selection.builder=false
 ssr.template.from.selection.builder.description=Allows building template with live-template-like placeholders when invoking SSR from the editor with selection
 ssr.in.editor.problem.highlighting=true
-ssr.in.editor.problem.highlighting.description=Show location of search template problems in the editor
+ssr.in.editor.problem.highlighting.description=Show the location of search template problems in the editor
 
 jdk.regex.soe.workaround=true
 jdk.regex.soe.workaround.description=In regular expression pattern replace choice \\n|. with . (and DOT_ALL option) to prevent stack overflow during matching
@@ -1932,18 +1926,13 @@ duplicates.inspection.only.extractable=false
 duplicates.inspection.only.extractable.description=Highlight duplicate code only if it can be extracted into a method
 
 duplicates.index.file.maxSize=102400
-duplicates.index.file.maxSize.description=Max size of a file indexed by duplicates analysis
+duplicates.index.file.maxSize.description=Max size of a file indexed by duplicate analysis
 duplicates.index.file.test.enable=false
 duplicates.index.file.test.enable.description=Enable duplicate index in test files
 
-ide.jvm.run.marker=false
-ide.jvm.run.marker.description=Enable JVM-lang based run line markers
 ide.create.field.enable.shortening=true
 ide.create.field.enable.shortening.description=Always enable shortening of FQNs in templates in Create Field fixes
 
-ide.jvm.command.line.clear.all.environments=true
-ide.jvm.command.line.clear.all.environments.description=Clear all environments when running a JVM command line application
-
 editor.adjust.right.margin=false
 editor.adjust.right.margin.description=Whether the right margin position for each visual line is shifted according to folded regions' and \
   inlays' widths on that line
@@ -1957,9 +1946,9 @@ editor.text.fractional.metrics.description=Do not round glyph advances to intege
 editor.text.xcode.vertical.spacing=false
 editor.text.xcode.vertical.spacing.description=Enable the same vertical spacing as Xcode editor uses
 editor.text.vertical.spacing.correct.rounding=false
-editor.text.vertical.spacing.correct.rounding.description=Make line spacing closer to that in other applications, when scaling factor is set
+editor.text.vertical.spacing.correct.rounding.description=Make line spacing closer to that in other applications when the scaling factor is set
 editor.disable.drag.with.right.button=false
-editor.disable.drag.with.right.button.description=Disable any mouse drag processing in the editor with right mouse button pressed
+editor.disable.drag.with.right.button.description=Disable any mouse drag processing in the editor with the right mouse button pressed
 editor.drag.sensitivity=5
 editor.drag.sensitivity.description=How far away must the mouse be moved for the move to be interpreted as a drag
 
@@ -1967,30 +1956,30 @@ idea.invalidate.caches.invalidates.vfs=false
 idea.invalidate.caches.invalidates.vfs.description=Invalidate caches tries to invalidate everything, including Local History
 
 editor.keep.completion.hints.longer=false
-editor.keep.completion.hints.longer.description=Don't remove hints for parameter names added on method call completion until caret moves \
+editor.keep.completion.hints.longer.description=Don't remove hints for parameter names added on method call completion until the caret moves \
   to another line
 editor.completion.hints.per.call.limit=256
 editor.completion.hints.per.call.limit.description=Limits the number or parameter placeholders/hints, populated on method call completion. \
   Further parameters appear on Tab presses.
 editor.completion.hints.virtual.comma=true
-editor.completion.hints.virtual.comma.description=Don't insert commas between completion hints for parameters, display comma as part of hint
+editor.completion.hints.virtual.comma.description=Don't insert commas between completion hints for parameters, display comma as part of the hint
 
 editor.codeVision.new=true
 editor.codeVision.new.description=New code vision hints (inlays)
 editor.codeVision.more.inlay=false
-editor.codeVision.more.inlay.description=Show `More\u2026` hint on hover over code vision entities
+editor.codeVision.more.inlay.description=Show the `More \u2026` hint on hover over code vision entities
 
 folding.signature.validation=false
 folding.signature.validation.description=Validate that signature for a PSI element, for which a folding region is generated, can be used to \
  find exactly the same PSI element
 
 try.starting.dumb.mode.where.many.files.changed=true
-try.starting.dumb.mode.where.many.files.changed.description=Enables automatic start of dumb mode for all opened projects once more than certain number of files is changed
+try.starting.dumb.mode.where.many.files.changed.description=Enables automatic start of dumb mode for all opened projects once more than a certain number of files is changed
 
 editor.highlight.foldings=true
 editor.highlight.foldings.description=Highlight folded regions containing certain highlighters (e.g., for search results)
 ide.hide.real.module.name=false
-ide.hide.real.module.name.description=Removes real module name from Project View in square brackets
+ide.hide.real.module.name.description=Removes the real module name from the Project View in square brackets
 ide.show.folder.name.instead.of.module.name=false
 ide.show.folder.name.instead.of.module.name.description=Use module folder name instead of module name in renderers
 
@@ -2001,27 +1990,24 @@ skip.move.resize.events.restartRequired=true
 skip.move.resize.events.description=Skip move/resize events from list/table/tree renderers during painting
 
 ide.content.manager.listeners.order.fix=true
-ide.content.manager.listeners.order.fix.description=Fixes historically reversed order of ContentManager listeners.
+ide.content.manager.listeners.order.fix.description=Fixes historically reversed the order of ContentManager listeners.
 
 run.anything.use.pty=true
 run.anything.use.pty.description=Determines if a PTY should be used for executing commands within the 'Run Anything' feature.
 
 ast.loading.filter=false
-ast.loading.filter.description=Enables the mechanism that disables AST loading in particular thread
+ast.loading.filter.description=Enables the mechanism that disables AST loading in a particular thread
 
 marketplace.certificate.signature.check=true
 marketplace.certificate.signature.check.description=Verify signatures for plugins downloaded from plugins.jetbrains.com
 custom-repository.certificate.signature.check=false
 custom-repository.certificate.signature.check.description=Verify signatures for plugins downloaded from custom plugin repositories and installed from disk
 
-batch.inspections.ignored.jvm.languages=Groovy,Scala
-batch.inspections.ignored.jvm.languages.description=Disable UAST processing for JVM languages; a comma separated list of UAST capable language ids.
-
 batch.inspections.startup.activities.timeout=180
 batch.inspections.startup.activities.timeout.description=Timeout of processing all startup activities in a batch inspections run (in minutes)
 
 ide.project.view.bookmarks.icon.before=false
-ide.project.view.bookmarks.icon.before.description=Shows bookmark icon before the Project View node icon
+ide.project.view.bookmarks.icon.before.description=Shows the bookmark icon before the Project View node icon
 
 ide.project.view.bookmarks.icon.hide=true
 ide.project.view.bookmarks.icon.hide.description=Hides bookmark icon for bookmarked nodes in the Project View
@@ -2039,7 +2025,7 @@ ide.project.view.persist.cached.presentation=true
 ide.project.view.persist.cached.presentation.description=Save and restore Project View presentation to quickly show nodes after restart before they're actually loaded
 
 ide.linux.enter.on.dialog.triggers.focused.button=true
-ide.linux.enter.on.dialog.triggers.focused.button.description=IDEA-125537 Pushing Enter in dialog windows chooses default focus instead of manually selected one on Linux
+ide.linux.enter.on.dialog.triggers.focused.button.description=IDEA-125537 Pushing Enter in dialog windows chooses the default focus instead of the manually selected one on Linux
 
 ide.linux.hide.native.title=true
 ide.linux.hide.native.title.description=Enables hiding native title feature for Linux
@@ -2071,18 +2057,18 @@ ide.edt.update.context.only.on.key.pressed.event=false
 ide.edt.update.context.only.on.key.pressed.event.description=Update context in IdeKeyEventDispatcher#updateCurrentContext only on key press
 
 new.search.everywhere.font.size.delta=0
-new.search.everywhere.font.size.delta.description=Sets how much font size should be increased in Search Everywhere popup text field
+new.search.everywhere.font.size.delta.description=Sets how much font size should be increased in the Search Everywhere popup text field
 new.search.everywhere.use.editor.font=false
-new.search.everywhere.use.editor.font.description=Switch Search Everywhere dialog to using editor font
+new.search.everywhere.use.editor.font.description=Switch the Search Everywhere dialog to using editor font
 search.everywhere.disable.history.for.all=false
-search.everywhere.disable.history.for.all.description=Disable saving previous search string for All tab
+search.everywhere.disable.history.for.all.description=Disable saving the previous search string for the All tab
 search.everywhere.show.weights=false
-search.everywhere.show.weights.description=Show item weights in description bar
+search.everywhere.show.weights.description=Show item weights in the description bar
 search.everywhere.detect.slow.contributors=true
 search.everywhere.detect.slow.contributors.description=Enables logging info about slow SE contributors
 
 toolwindow.active.tab.use.contrast.background=false
-toolwindow.active.tab.use.contrast.background.description=When enabled contrast color is used for selected tab background in tool windows
+toolwindow.active.tab.use.contrast.background.description=When enabled, contrast color is used for the selected tab background in tool windows
 toolwindow.active.tab.contrast.background.color=808080
 toolwindow.active.tab.contrast.background.color.description=Contrast color for the selected tab background in tool windows
 toolwindow.disable.overlay.by.double.key=false
@@ -2091,20 +2077,15 @@ toolwindow.open.tab.in.editor=false
 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 profiler are set before every profiler start
+linux.kernel.variables.validate.every.time.description=Check that kernel variables required to run the profiler are set before every profiler start
 
-idea.profiler.jvm.dtrace=false
-idea.profiler.jvm.dtrace.description=Enable JVM DTrace based profiler on macOS
-idea.profiler.jfr.max.events.of.type.per.chunk=100
-idea.profiler.jfr.max.events.of.type.per.chunk.description=Maximum number of events of a particular type (i.e. "JVM Information") \
-  per chunk to be shown in the Events tab
 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 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 'Duplicated Strings' tab in the Profiler Tool Window
+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
@@ -2131,7 +2112,7 @@ 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 recent location.
+recent.locations.lines.before.and.after.description=Defines the number of lines that are shown before and after a recent location.
 
 clipboard.history.max.items=100
 clipboard.history.max.items.description=Maximum number of items in clipboard history
@@ -2142,10 +2123,10 @@ plugins.show.implementation.details=false
 plugins.show.implementation.details.description=Show plugins which are marked as implementation-detail
 
 error.navigation.show.tooltip=true
-error.navigation.show.tooltip.description=Show error description after navigating to next/previous error
+error.navigation.show.tooltip.description=Show error description after navigating to the next / previous error
 
 copy.tbx.reference.enabled=false
-copy.tbx.reference.enabled.description=Enable "Copy TBX Reference URL" action
+copy.tbx.reference.enabled.description=Enable the "Copy TBX Reference URL" action
 
 ide.project.frame.as.splash=false
 ide.project.frame.as.splash.description=Whether to replace the splash screen with a project frame
@@ -2153,16 +2134,16 @@ ide.project.frame.as.splash.description=Whether to replace the splash screen wit
 ide.project.frame.screen.bounds.tolerance=10
 ide.project.frame.screen.bounds.tolerance.description=How far (in pixels) beyond the screen the IDE frame is allowed to extend when restoring its previously saved bounds
 ide.project.frame.auto.fix.size.windows=true
-ide.project.frame.auto.fix.size.windows.description=Automatically fix the frame size and location on Windows in case it becomes very small
+ide.project.frame.auto.fix.size.windows.description=Automatically fix the frame size and location on Windows in case it becomes tiny
 
 ide.project.loading.show.last.state=false
-ide.project.loading.show.last.state.description=Show last state screenshot instead of project loading progress
+ide.project.loading.show.last.state.description=Show the last state screenshot instead of project loading progress
 
 contrast.scrollbars.alpha.level=-1
-contrast.scrollbars.alpha.level.description=Alpha level for contrast scrollbars (accessibility option). If alpha<0 default value will be used
+contrast.scrollbars.alpha.level.description=Alpha level for contrast scrollbars (accessibility option). If alpha < 0 default value will be used
 
 ide.background.post.startup.activity.delay=5000
-ide.background.post.startup.activity.delay.description=Delay in milliseconds between the end of normal IDE startup and the start of executing background post-startup activities
+ide.background.post.startup.activity.delay.description=Delay in milliseconds between the end of a normal IDE startup and the start of executing background post-startup activities
 
 ide.plugins.allow.unload=true
 ide.plugins.allow.unload.description=Allow loading and unloading plugins without a restart
@@ -2173,7 +2154,7 @@ ide.plugins.snapshot.on.unload.fail.description=Capture memory snapshot when unl
 ide.plugins.analyze.snapshot=true
 ide.plugins.analyze.snapshot.description=Automatically analyze snapshots produced when plugin unload fails
 ide.plugins.unload.timeout=5000
-ide.plugins.unload.timeout.description=Time to wait for classloader to be garbage-collected on plugin unloading (ms)
+ide.plugins.unload.timeout.description=Time to wait for a classloader to be garbage-collected on plugin unloading (ms)
 ide.plugins.load.automatically=false
 ide.plugins.load.automatically.description=Automatically load required plugins when possible
 ide.plugins.suggest.install.optional.dependencies=false
@@ -2192,7 +2173,7 @@ ide.activity.tracking.enable.debug=false
 ide.activity.tracking.enable.debug.description=Record debug information for `Observation.awaitConfiguration`
 
 light.edit.file.open.enabled=true
-light.edit.file.open.enabled.description=Open files in off-project editor instead of creating a temporary project
+light.edit.file.open.enabled.description=Open files in the off-project editor instead of creating a temporary project
 system.file.type.associations.enabled=true
 system.file.type.associations.enabled.description=Enable Tools|Associate File Types with... action
 
@@ -2232,7 +2213,7 @@ ide.animate.toolwindows.description=Use slide animation when showing/hiding unpi
 editor.show.notification.after.reformat=true
 editor.show.notification.after.reformat.description=Show hint notification after Reformat Code action
 editor.show.notification.after.optimize.imports=true
-editor.show.notification.after.optimize.imports.description=Show hint notification after Optimize Imports action
+editor.show.notification.after.optimize.imports.description=Show hint notification after the Optimize Imports action
 editor.scope.based.formatting.ui=false
 editor.scope.based.formatting.ui.description=Enables UI for deprecated scope-based formatting
 
@@ -2245,17 +2226,17 @@ ide.widget.toolbar.description=Widget toolbar UI
 ide.widget.toolbar.logging=false
 ide.widget.toolbar.logging.description=Log startup info for the run widget
 ide.widget.toolbar.experimentalUpdating=true
-ide.widget.toolbar.experimentalUpdating.description=If enabled, run widget startup will be faster, but update will become unstable
+ide.widget.toolbar.experimentalUpdating.description=If enabled, run widget startup will be faster, but the update will become unstable
 ide.widget.toolbar.is.settings.available=false
 ide.widget.toolbar.is.settings.available.description=If enabled, run widget settings will be shown in the preferences
 
 ide.lookup.shrink=false
-ide.lookup.shrink.description=Reduce completion popup width automatically while scrolling, if visible items all fit
+ide.lookup.shrink.description=Reduce completion popup width automatically while scrolling if visible items all fit
 
 ide.undo.fallback=false
-ide.undo.fallback.description=Fallback on local stack if global command is blocking
+ide.undo.fallback.description=Fallback on the local stack if the global command is blocking
 ide.undo.transparent.caret.movement=false
-ide.undo.transparent.caret.movement.description=When enabled caret movement will no longer be a separate undo step
+ide.undo.transparent.caret.movement.description=When enabled, caret movement will no longer be a separate undo step
 ide.undo.frontend.if.possible=true
 ide.undo.frontend.if.possible.restartRequired=true
 ide.undo.frontend.if.possible.description=Feature flag for IJPL-185748 (WIP!). If enabled, undo/redo is performed on the frontend side if possible.
@@ -2270,7 +2251,7 @@ ide.experimental.ui.inter.font.description=Use Inter font for context menus in E
 ide.experimental.ui.animations=true
 ide.experimental.ui.animations.description=Animate resizing of editor splits
 ide.experimental.ui.meetNewUi=true
-ide.experimental.ui.meetNewUi.description=Turns on Meet New UI tool window
+ide.experimental.ui.meetNewUi.description=Turns on the Meet New UI tool window
 ide.experimental.ui.meetNewUi.restartRequired=true
 ide.experimental.ui.tree.selection=true
 ide.experimental.ui.tree.selection.description=New UI for selected tree nodes
@@ -2283,7 +2264,7 @@ ide.experimental.ui.editor.tabs.scrollbar.description=Add scrollbar to editor ta
 
 ide.web.preview.enabled=true
 ide.web.preview.enabled.restartRequired=true
-ide.web.preview.enabled.description=Ability to preview HTML content directly in IDE
+ide.web.preview.enabled.description=Ability to preview HTML content directly in the IDE
 
 ide.color.scheme.for.descriptor.preview.enabled=false
 ide.color.scheme.for.descriptor.preview.enabled.description=Use IDE colors for the editor preview in toolwindows
@@ -2330,7 +2311,7 @@ ide.slow.operations.assertion.vcs.line-status-tracker-provider=false
 ide.slow.operations.assertion.vcs.line-status-tracker-provider.description=An `ide.slow.operations.assertion` sub-flag for LineStatusTrackerManager
 
 ide.show.open.button.in.tip.dialog=false
-ide.show.open.button.in.tip.dialog.description=Shows Open button in Tip of the Day dialog to load a custom HTML file to preview
+ide.show.open.button.in.tip.dialog.description=Shows the Open button in the Tip of the Day dialog to load a custom HTML file to preview
 
 ide.save.missing.jb.colors=false
 ide.save.missing.jb.colors.description=A missing named color will be added to UIDefaults with !!! suffix
@@ -2354,13 +2335,13 @@ ide.disable.intellij.project.analytics=false
 ide.disable.intellij.project.analytics.description=Option to disable fine-tuned analytics for IntelliJ project
 
 ide.text.editor.with.preview.show.floating.toolbar=true
-ide.text.editor.with.preview.show.floating.toolbar.description=Show floating toolbar with layouts instead of permanent toolbar
+ide.text.editor.with.preview.show.floating.toolbar.description=Show a floating toolbar with layouts instead of a permanent toolbar
 
 ide.project.icon.size=20
 ide.project.icon.size.description=Icon size for project icons
 
 ide.problems.view.empty.status.actions=true
-ide.problems.view.empty.status.actions.description=Project Errors in Problems View shows predefined actions in empty text
+ide.problems.view.empty.status.actions.description=Project Errors in the Problems View show predefined actions in empty text
 
 ide.problems.view.notify.later=true
 ide.problems.view.notify.later.description=Problems View notifies listeners later on EDT
@@ -2372,9 +2353,6 @@ ide.problems.view.provider.class.filter.description=Specify qualified class name
 ide.presentation.assistant.theme.enabled=false
 ide.presentation.assistant.theme.enabled.description=If true, Presentation Assistant popups will use alternative colors from their color scheme
 
-eclipse.scan.home.directory=true
-eclipse.scan.home.directory.description=Scan home directory for existing Eclipse projects
-
 ide.diagnostics.show.context.menu.invocation.time=false
 ide.diagnostics.show.context.menu.invocation.time.description=Show time in ms between mouse event and context menu appearance on screen
 
@@ -2396,7 +2374,7 @@ editor.text.field.init.on.shown=true
 editor.text.field.init.on.shown.description=Initialize EditorTextField when first shown
 
 ide.gtd.show.error=true
-ide.gtd.show.error.description=Whether to show "Cannot find declaration to go" error by "Go To Declaration" action
+ide.gtd.show.error.description=Whether to show the "Cannot find declaration to go" error by "Go To Declaration" action
 
 ide.ui.new.file.chooser=false
 ide.ui.new.file.chooser.description=Experimental file chooser implementation (IJPL-338)
@@ -2407,22 +2385,19 @@ ide.editor.tab.selection.animation=false
 ide.editor.tab.selection.animation.description=Animate tab underline when switching editor tabs
 
 calculate.gutter.actions.always=false
-calculate.gutter.actions.always.description=Calculate all gutter icons/actions even if Editor|General|Gutter Icons|Show icons is set to "off", to be able to show these actions in Alt-Enter
+calculate.gutter.actions.always.description=Calculate all gutter icons/actions even if Editor|General|Gutter Icons|Show icons is set to "off" to be able to show these actions in Alt-Enter
 
 ide.debug.gutter.area=false
 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 background
+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 wsl sync engine to copy data between Linux and Windows
+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 heartbeat thread starts reporting performance data
-
-static.analysis.use.js.configurator=false
-static.analysis.use.js.configurator.description=Whether to autoconfigure java-script project
+ide.heartbeat.delay.description=Delay before the heartbeat thread starts reporting performance data
 
 ide.ui.wrap.colors=true
 ide.ui.wrap.colors.description=Wrap UI colors to colors with name
@@ -2443,7 +2418,7 @@ ide.scale.discrete.take.floor=false
 ide.scale.discrete.take.floor.description=Use floor from Float when discretion the ide scale value. That would make icon scaling more aligned with font scaling.
 
 ide.popup.align.by.content=true
-ide.popup.align.by.content.description=When popup is shown under a component use vertical alignment not by their border but by their content
+ide.popup.align.by.content.description=When a popup is shown under a component, use vertical alignment not by their border but by their content
 
 ide.mac.stage.manager.support=false
 ide.mac.stage.manager.support.description=Support for Stage Manager in macOS Ventura. If enabled, dialogs stop jumping
@@ -2473,7 +2448,7 @@ idea.ignore.disabled.plugins.description=Ignores disabled plugin state
 
 editor.readerMode.vfmt.removeZombies=true
 editor.readerMode.vfmt.removeZombies.description=Enables fix for IDEA-313274. It prevents erroneously cached visual formattingfoldings \
-  from being loaded into editor.
+  from being loaded into the editor.
 editor.readerMode.vfmt.removeZombies.restartRequired=true
 
 ide.speed.search.allow.custom.location=false
@@ -2486,7 +2461,7 @@ ide.colorful.toolbar.gradient.type=[Just Icon|Linear Gradient and Icon|Circular
 ide.colorful.toolbar.gradient.type.description=Defines types of main toolbar decorations
 ide.colorful.toolbar.gradient.radius.description=Radius of the gradient in Main Toolbar
 ide.colorful.toolbar.gradient.saturation=0.85
-ide.colorful.toolbar.gradient.saturation.description=Saturation of the gradient color in Main Toolbar
+ide.colorful.toolbar.gradient.saturation.description=Saturation of the gradient color in the Main Toolbar
 ide.colorful.toolbar.force=true
 ide.colorful.toolbar.force.description=Show 'Colorful toolbar' even if there is one project open (works only if the feature is enabled). \
   Reopen project or restart IDE to apply the setting
diff --git a/plugins/devkit/devkit-core/resources/inspectionDescriptions/PluginKeysAreProhibitedInPlatformRegistry.html b/plugins/devkit/devkit-core/resources/inspectionDescriptions/PluginKeysAreProhibitedInPlatformRegistry.html
new file mode 100644
index 000000000000..78dcc4d4e356
--- /dev/null
+++ b/plugins/devkit/devkit-core/resources/inspectionDescriptions/PluginKeysAreProhibitedInPlatformRegistry.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Highlights keys in `registry.properties` that are not allowed in the platform registry and must be moved to plugins.
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
index b55e00b76652..4d326eaa151f 100644
--- a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
+++ b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
@@ -659,7 +659,13 @@
       implementation="org.jetbrains.idea.devkit.references.MessageBundleReferenceContributor$ImplicitUsageProvider"/>
     <codeInsight.implicitSubclassProvider implementation="org.jetbrains.idea.devkit.inspections.DevKitImplicitSubclassProvider"/>
 
-    <annotator language="Properties" implementationClass="org.jetbrains.idea.devkit.inspections.RegistryPropertiesAnnotator"/>
+    <localInspection language="Properties"
+                     level="ERROR"
+                     enabledByDefault="true"
+                     key="inspections.plugin.keys.in.platform.registry"
+                     groupPathKey="inspections.group.path" groupKey="inspections.group.code"
+                     shortName="PluginKeysAreProhibitedInPlatformRegistry"
+                     implementationClass="org.jetbrains.idea.devkit.inspections.RegistryPropertiesInspection"/>
 
     <moduleService serviceImplementation="org.jetbrains.idea.devkit.build.PluginBuildConfiguration"/>
     <backgroundPostStartupActivity
diff --git a/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties b/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties
index 82bee849f2f1..a0cfc85b1a71 100644
--- a/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties
+++ b/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties
@@ -832,4 +832,5 @@ plugins.go.description=Go language
 plugins.php.description=PHP language
 plugins.ruby.description=Ruby language
 plugins.rust.description=Rust language
-inspection.use.optimized.eel.functions.display.name=Use optimized function from EelApi
\ No newline at end of file
+inspection.use.optimized.eel.functions.display.name=Use optimized function from EelApi
+inspections.plugin.keys.in.platform.registry=Plugin keys defined in platform regitry.properties
\ No newline at end of file
diff --git a/plugins/devkit/devkit-core/src/inspections/RegistryPropertiesAnnotator.kt b/plugins/devkit/devkit-core/src/inspections/RegistryPropertiesAnnotator.kt
index 29434df24d81..ba42373d2f55 100644
--- a/plugins/devkit/devkit-core/src/inspections/RegistryPropertiesAnnotator.kt
+++ b/plugins/devkit/devkit-core/src/inspections/RegistryPropertiesAnnotator.kt
@@ -2,36 +2,27 @@
 
 package org.jetbrains.idea.devkit.inspections
 
-import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo
 import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils
-import com.intellij.lang.annotation.AnnotationHolder
-import com.intellij.lang.annotation.Annotator
-import com.intellij.lang.annotation.HighlightSeverity
-import com.intellij.lang.properties.psi.PropertiesFile
+import com.intellij.codeInspection.*
+import com.intellij.lang.properties.PropertiesImplUtil
 import com.intellij.lang.properties.psi.impl.PropertyImpl
 import com.intellij.lang.properties.psi.impl.PropertyKeyImpl
-import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.IntelliJProjectUtil
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.Messages
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.PsiFile
-import com.intellij.util.IncorrectOperationException
 import com.intellij.util.PsiNavigateUtil
 import org.jetbrains.annotations.Nls
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.idea.devkit.DevKitBundle
 import java.util.*
 
-@NonNls
 internal const val REGISTRY_PROPERTIES_FILENAME = "registry.properties"
-
-@NonNls
 internal const val DESCRIPTION_SUFFIX = ".description"
-
-@NonNls
 internal const val RESTART_REQUIRED_SUFFIX = ".restartRequired"
 
 internal fun isImplicitUsageKey(keyName: String): Boolean {
@@ -39,120 +30,120 @@ internal fun isImplicitUsageKey(keyName: String): Boolean {
          keyName.endsWith(RESTART_REQUIRED_SUFFIX)
 }
 
+private val PLUGIN_GROUP_NAMES = setOf(
+  "appcode", "cidr", "clion",
+  "cvs", "git", "github", "svn", "hg4idea", "tfs",
+  "dart", "markdown",
+  "java", "javac", "uast", "junit4", "dsm",
+  "js", "javascript", "typescript", "nodejs", "eslint", "jest",
+  "ruby", "rubymine",
+  "groovy", "grails", "python", "php",
+  "kotlin", "spring", "jupyter", "dataspell", "javafx",
+  "maven", "gradle", "android", "eclipse",
+  "rider", "compiler"
+)
+
 internal fun isRegistryPropertiesFile(psiFile: PsiFile): Boolean {
   return IntelliJProjectUtil.isIntelliJPlatformProject(psiFile.project) && psiFile.name == REGISTRY_PROPERTIES_FILENAME
 }
 
-/**
- * Highlights key in `registry.properties` without matching `key.description` entry + corresponding quickfix.
- */
-private class RegistryPropertiesAnnotator : Annotator, DumbAware {
-  @NonNls
-  private val PLUGIN_GROUP_NAMES = setOf(
-    "appcode", "cidr", "clion",
-    "cvs", "git", "github", "svn", "hg4idea", "tfs",
-    "dart", "markdown",
-    "java", "javac", "uast", "junit4", "dsm",
-    "js", "javascript", "typescript", "nodejs", "eslint", "jest",
-    "ruby", "rubymine",
-    "groovy", "grails", "python", "php",
-    "kotlin", "spring", "jupyter", "dataspell", "javafx",
-    "maven", "gradle", "android", "eclipse"
-  )
+internal class RegistryPropertiesInspection : LocalInspectionTool() {
+  override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor {
+    if (!isRegistryPropertiesFile(holder.file)) return PsiElementVisitor.EMPTY_VISITOR
 
-  override fun annotate(element: PsiElement, holder: AnnotationHolder) {
-    if (element !is PropertyKeyImpl) return
+    val propertiesFile = PropertiesImplUtil.getPropertiesFile(holder.file)
 
-    val file = holder.currentAnnotationSession.file
-    if (!isRegistryPropertiesFile(file)) {
-      return
-    }
+    return object : PsiElementVisitor() {
+      override fun visitElement(element: PsiElement) {
+        if (element !is PropertyKeyImpl) return
 
-    val propertyName = element.text
-    if (isImplicitUsageKey(propertyName)) {
-      return
-    }
+        val propertyName = element.text
+        if (isImplicitUsageKey(propertyName)) {
+          return
+        }
 
-    val groupName = propertyName.substringBefore('.').lowercase(Locale.getDefault())
+        val groupName = propertyName.substringBefore('.').lowercase(Locale.getDefault())
 
-    if (PLUGIN_GROUP_NAMES.contains(groupName) ||
-        propertyName.startsWith("editor.config.") ||
-        propertyName.startsWith("debugger.kotlin.") ||
-        propertyName.startsWith("debugger.enable.kotlin.") ||
-        propertyName.startsWith("ide.java.") ||
-        propertyName.startsWith("execution.java.") ||
-        propertyName.startsWith("debugger.log.jdi.")) {
+        if (PLUGIN_GROUP_NAMES.contains(groupName) ||
+            propertyName.startsWith("editor.config.") ||
+            propertyName.startsWith("debugger.kotlin.") ||
+            propertyName.startsWith("debugger.enable.kotlin.") ||
+            propertyName.startsWith("ide.java.") ||
+            propertyName.startsWith("ide.jvm.") ||
+            propertyName.startsWith("idea.profiler.") ||
+            propertyName.startsWith("execution.java.") ||
+            propertyName.startsWith("debugger.log.jdi.")) {
 
-      holder.newAnnotation(HighlightSeverity.ERROR, DevKitBundle.message("registry.properties.annotator.plugin.keys.use.ep"))
-        .withFix(ShowEPDeclarationIntention(propertyName)).create()
-    }
+          holder.registerProblem(
+            element,
+            DevKitBundle.message("registry.properties.annotator.plugin.keys.use.ep"),
+            ShowEPDeclarationIntention(propertyName, element)
+          )
+        }
 
-    val propertiesFile = file as PropertiesFile
-    val descriptionProperty = propertiesFile.findPropertyByKey(propertyName + DESCRIPTION_SUFFIX)
-    if (descriptionProperty == null) {
-      holder.newAnnotation(HighlightSeverity.WARNING,
-                           DevKitBundle.message("registry.properties.annotator.key.no.description.key", propertyName))
-        .withFix(AddDescriptionKeyIntention(propertyName)).create()
+        val descriptionProperty = propertiesFile?.findPropertyByKey(propertyName + DESCRIPTION_SUFFIX)
+        if (descriptionProperty == null) {
+          holder.registerProblem(
+            element,
+            DevKitBundle.message("registry.properties.annotator.key.no.description.key", propertyName),
+            ProblemHighlightType.WARNING,
+            AddDescriptionKeyIntention(propertyName, element)
+          )
+        }
+      }
     }
   }
+}
 
-  private class ShowEPDeclarationIntention(private val propertyName: String) : IntentionAction, DumbAware {
-    override fun startInWriteAction(): Boolean = false
+private class ShowEPDeclarationIntention(private val propertyName: String, element: PsiElement) : LocalQuickFixOnPsiElement(element), DumbAware {
+  override fun startInWriteAction(): Boolean = false
+  override fun getFamilyName(): String = DevKitBundle.message("registry.properties.annotator.show.ep.family.name")
+  override fun getText(): String = DevKitBundle.message("registry.properties.annotator.show.ep.name", propertyName)
 
-    override fun generatePreview(project: Project, editor: Editor, psiFile: PsiFile): IntentionPreviewInfo {
-      return IntentionPreviewInfo.EMPTY
+  override fun invoke(project: Project, psiFile: PsiFile, startElement: PsiElement, endElement: PsiElement) {
+    val propertiesFile = psiFile.let { PropertiesImplUtil.getPropertiesFile(it) } ?: return
+    val defaultValue = propertiesFile.findPropertyByKey(propertyName)?.value
+    val description = propertiesFile.findPropertyByKey(propertyName + DESCRIPTION_SUFFIX)?.value
+    @NonNls var restartRequiredText = ""
+    if (propertiesFile.findPropertyByKey(propertyName + RESTART_REQUIRED_SUFFIX) != null) {
+      restartRequiredText = "restartRequired=\"true\""
     }
 
-    override fun getFamilyName(): String = DevKitBundle.message("registry.properties.annotator.show.ep.family.name")
-
-    override fun isAvailable(project: Project, editor: Editor?, psiFile: PsiFile?): Boolean = true
-
-    override fun getText(): String = DevKitBundle.message("registry.properties.annotator.show.ep.name", propertyName)
-
-    override fun invoke(project: Project, editor: Editor?, psiFile: PsiFile?) {
-      val propertiesFile = psiFile as PropertiesFile
-      val defaultValue = propertiesFile.findPropertyByKey(propertyName)!!.value
-      val description = propertiesFile.findPropertyByKey(propertyName + DESCRIPTION_SUFFIX)?.value
-      @NonNls var restartRequiredText = ""
-      if (propertiesFile.findPropertyByKey(propertyName + RESTART_REQUIRED_SUFFIX) != null) {
-        restartRequiredText = "restartRequired=\"true\""
-      }
-
-      val epText = """
+    val epText = """
         <registryKey key="${propertyName}" defaultValue="${defaultValue}" ${restartRequiredText}
                      description="${description}"/>
       """.trimIndent()
-      Messages.showMultilineInputDialog(project,
-                                        DevKitBundle.message("registry.properties.annotator.show.ep.message"),
-                                        DevKitBundle.message("registry.properties.annotator.show.ep.title"),
-                                        epText, null, null)
-    }
+    Messages.showMultilineInputDialog(project,
+                                      DevKitBundle.message("registry.properties.annotator.show.ep.message"),
+                                      DevKitBundle.message("registry.properties.annotator.show.ep.title"),
+                                      epText, null, null)
   }
 
-  private class AddDescriptionKeyIntention(private val myPropertyName: String) : IntentionAction, DumbAware {
+  override fun generatePreview(project: Project, previewDescriptor: ProblemDescriptor): IntentionPreviewInfo = IntentionPreviewInfo.EMPTY
+}
 
-    @Nls
-    override fun getText(): String = DevKitBundle.message("registry.properties.annotator.add.description.text", myPropertyName)
+private class AddDescriptionKeyIntention(private val myPropertyName: String, element: PsiElement) : LocalQuickFixOnPsiElement(element), DumbAware {
+  override fun startInWriteAction(): Boolean = true
+  override fun getText(): @Nls String = DevKitBundle.message("registry.properties.annotator.add.description.text", myPropertyName)
+  override fun getFamilyName(): @Nls String = DevKitBundle.message("registry.properties.annotator.add.description.family.name")
 
-    @Nls
-    override fun getFamilyName(): String = DevKitBundle.message("registry.properties.annotator.add.description.family.name")
+  override fun invoke(project: Project, psiFile: PsiFile, startElement: PsiElement, endElement: PsiElement) {
+    val propertiesFile = psiFile.let { PropertiesImplUtil.getPropertiesFile(it) } ?: return
 
-    override fun isAvailable(project: Project, editor: Editor, psiFile: PsiFile): Boolean = true
+    val originalProperty = propertiesFile.findPropertyByKey(myPropertyName)
+    val descriptionProperty = propertiesFile.addPropertyAfter(myPropertyName + DESCRIPTION_SUFFIX, "Description", originalProperty)
 
-    @Throws(IncorrectOperationException::class)
-    override fun invoke(project: Project, editor: Editor, psiFile: PsiFile) {
-      val propertiesFile = psiFile as PropertiesFile
-
-      val originalProperty = propertiesFile.findPropertyByKey(myPropertyName) as PropertyImpl?
-      val descriptionProperty = propertiesFile.addPropertyAfter(myPropertyName + DESCRIPTION_SUFFIX, "Description", originalProperty)
-
-      val valueNode = (descriptionProperty.psiElement as PropertyImpl).valueNode!!
-      if (!IntentionPreviewUtils.isPreviewElement(valueNode.psi)) {
-        PsiNavigateUtil.navigate(valueNode.psi)
+    val psi = descriptionProperty.psiElement
+    if (psi is PropertyImpl) {
+      val valuePsi = psi.valueNode?.psi ?: psi
+      if (!IntentionPreviewUtils.isPreviewElement(valuePsi)) {
+        PsiNavigateUtil.navigate(valuePsi)
       }
     }
-
-    override fun startInWriteAction(): Boolean = true
+    else if (!IntentionPreviewUtils.isPreviewElement(psi)) {
+      PsiNavigateUtil.navigate(psi)
+    }
   }
 
+  override fun generatePreview(project: Project, previewDescriptor: ProblemDescriptor): IntentionPreviewInfo = IntentionPreviewInfo.EMPTY
 }
\ No newline at end of file
diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/DevkitInspectionsRegistrationCheckTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/DevkitInspectionsRegistrationCheckTest.java
index e3c61f10b721..e65a8e631b5f 100644
--- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/DevkitInspectionsRegistrationCheckTest.java
+++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/DevkitInspectionsRegistrationCheckTest.java
@@ -12,7 +12,7 @@ import java.util.stream.Stream;
 
 public class DevkitInspectionsRegistrationCheckTest extends BasePlatformTestCase {
 
-  private static final int EXPECTED_INSPECTIONS_NUMBER = 87;
+  private static final int EXPECTED_INSPECTIONS_NUMBER = 88;
 
   /**
    * Inspections that are finished and intentionally disabled.
diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginConfigReferenceTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginConfigReferenceTest.java
index efc49df5a69b..6b1d933dec1d 100644
--- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginConfigReferenceTest.java
+++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginConfigReferenceTest.java
@@ -71,7 +71,7 @@ public class PluginConfigReferenceTest extends JavaCodeInsightFixtureTestCase {
     assertEquals(AllIcons.Nodes.PluginRestart, plugin.getIcon());
 
     final LookupElementPresentation properties = getLookupElementPresentation("vcs.showConsole");
-    assertEquals(" Show 'Console' tab in VCS toolwindow that logs all write-commands performed by IDE.", properties.getTailText());
+    assertEquals(" Show the 'Console' tab in the VCS toolwindow that logs all write-commands performed by IDE.", properties.getTailText());
     assertEquals("true", properties.getTypeText());
     assertEquals(AllIcons.Nodes.Plugin, properties.getIcon());
   }
diff --git a/plugins/eclipse/resources/META-INF/plugin.xml b/plugins/eclipse/resources/META-INF/plugin.xml
index 420f2b9439ed..3e6d2a9d03e0 100644
--- a/plugins/eclipse/resources/META-INF/plugin.xml
+++ b/plugins/eclipse/resources/META-INF/plugin.xml
@@ -6,8 +6,8 @@
       <![CDATA[
         Enables interoperability with Eclipse and provides the following features:
         <ul>
-        <li>Open Eclipse project in IntelliJ IDEA</li>
-        <li>Import Eclipse project into IntelliJ IDEA</li>
+        <li>Open an Eclipse project in IntelliJ IDEA</li>
+        <li>Import an Eclipse project into IntelliJ IDEA</li>
         <li>Export IntelliJ IDEA project into Eclipse</li>
         <li>Convert IntelliJ IDEA module to Eclipse-compatible format</li>
         <li>Synchronize Eclipse project files</li>
@@ -48,6 +48,7 @@
     <notificationGroup id="Unknown Natures Detected" displayType="BALLOON" bundle="messages.EclipseBundle" key="notification.group.unknown.natures"/>
     <welcome.projectDetector implementation="org.jetbrains.idea.eclipse.detect.EclipseProjectDetector"/>
     <statistics.counterUsagesCollector implementationClass="org.jetbrains.idea.eclipse.detect.EclipseProjectDetectorUsagesCollector"/>
+    <registryKey key="eclipse.scan.home.directory" defaultValue="true" description="Scan home directory for existing Eclipse projects"/>
   </extensions>
   <actions>
     <action id="ExportToEclipse" class="org.jetbrains.idea.eclipse.export.ExportEclipseProjectsAction">
diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/detect/EclipseProjectDetector.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/detect/EclipseProjectDetector.java
index 004542433c7b..4adc89407743 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/detect/EclipseProjectDetector.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/detect/EclipseProjectDetector.java
@@ -11,6 +11,7 @@ import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileSystemUtil;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.impl.welcomeScreen.ProjectDetector;
 import com.intellij.util.ArrayUtil;
@@ -53,7 +54,7 @@ public final class EclipseProjectDetector extends ProjectDetector {
     for (String appLocation : getStandardAppLocations()) {
       collectProjects(projects, Path.of(appLocation));
     }
-    if (PropertiesComponent.getInstance().getBoolean("eclipse.scan.home.directory", true)) {
+    if (Registry.is("eclipse.scan.home.directory", true)) {
       visitFiles(new File(home), file1 -> scanForProjects(file1.getPath(), projects), 2);
     }
   }
@@ -80,7 +81,7 @@ public final class EclipseProjectDetector extends ProjectDetector {
         ProjectGroup group = ContainerUtil.find(manager.getGroups(), g -> groupName.equals(g.getName()));
         String property = "eclipse.projects.detected";
         if (group == null && PropertiesComponent.getInstance().isValueSet(property)) {
-          // the group was removed by user
+          // the user removed the group
           return;
         }
 
diff --git a/plugins/gradle/java/resources/META-INF/plugin.xml b/plugins/gradle/java/resources/META-INF/plugin.xml
index ee5bd398e926..88ec4e9ef917 100644
--- a/plugins/gradle/java/resources/META-INF/plugin.xml
+++ b/plugins/gradle/java/resources/META-INF/plugin.xml
@@ -129,6 +129,10 @@
                  description="Specifies port at which Gradle target server process will wait for debugger connections. -1 means disabled feature."/>
     <registryKey key="gradle.refresh.project.outputs" defaultValue="true"
                  description="After a Gradle task, do a shallow refresh of modules outputs in VFS"/>
+    <registryKey key="android.gradle.project.startup.activity.disabled" defaultValue="false"
+                 description="Disable Gradle post-startup activity for Android projects"/>
+    <registryKey key="android.sdk.local.properties.update.disabled" defaultValue="false"
+                 description="Disable update android sdk for local.properties"/>
 
     <localInspection language="UAST" groupPath="Gradle" shortName="ConfigurationAvoidance"
                      bundle="messages.GradleInspectionBundle"
diff --git a/plugins/gradle/plugin-resources/META-INF/plugin.xml b/plugins/gradle/plugin-resources/META-INF/plugin.xml
index 27fce5d1a303..90ab3770da95 100644
--- a/plugins/gradle/plugin-resources/META-INF/plugin.xml
+++ b/plugins/gradle/plugin-resources/META-INF/plugin.xml
@@ -210,6 +210,8 @@
 
     <search.optionContributor implementation="org.jetbrains.plugins.gradle.config.GradleSearchableOptionContributor"/>
 
+    <registryKey key="GRADLE.system.in.process" defaultValue="true"
+                 description="Whether IDEA should use 'in-process' mode for interaction with Gradle API"/>
     <registryKey key="gradle.daemon.jvm.criteria" defaultValue="true"
                  description="Enable the Gradle Daemon JVM criteria allowing to detect provisioning required toolchain for the build"/>
     <registryKey key="gradle.daemon.jvm.criteria.new.project" defaultValue="false"
@@ -246,6 +248,9 @@
     <registryKey key="gradle.daemon.legacy.dependency.resolver" defaultValue="false"
                  description="Use ArtifactResolutionQuery instead of ArtifactView to resolve Javadoc/Sources"/>
     <registryKey key="gradle.sync.use.eel.for.wsl" defaultValue="true" description="Use EEL API for WSL projects"/>
+    <registryKey key="gradle.auto.auto.jdk.fix.disabled" defaultValue="false"
+                 description="Disable attempt to fix unknown JDK in Gradle configuration on project open"/>
+
     <commandLineInspectionProjectConfigurator implementation="org.jetbrains.plugins.gradle.GradleCommandLineProjectConfigurator"/>
     <warmupConfigurator implementation="org.jetbrains.plugins.gradle.GradleWarmupConfigurator"/>
     <notificationGroup id="Gradle Notification Group" displayType="STICKY_BALLOON" bundle="messages.GradleBundle" key="notification.group.gradle"/>
diff --git a/plugins/javaFX/resources/intellij.javaFX.xml b/plugins/javaFX/resources/intellij.javaFX.xml
index 0a2baab33fa7..e9f2aca565b5 100644
--- a/plugins/javaFX/resources/intellij.javaFX.xml
+++ b/plugins/javaFX/resources/intellij.javaFX.xml
@@ -105,6 +105,9 @@
     <internalFileTemplate name="FxmlFile"/>
 
     <spellchecker.bundledDictionaryProvider implementation="org.jetbrains.plugins.javaFX.JavafxBundledDictionaryProvider"/>
+
+    <registryKey key="javafx.fxml.controller.from.loader" defaultValue="false"
+                 description="Resolve FXML controllers specified with FXMLLoader.setController()"/>
   </extensions>
 
   <projectListeners>
diff --git a/plugins/kotlin/plugin/common/resources/META-INF/jvm-debugger.xml b/plugins/kotlin/plugin/common/resources/META-INF/jvm-debugger.xml
index 2120e525780b..da9a5818e4cf 100644
--- a/plugins/kotlin/plugin/common/resources/META-INF/jvm-debugger.xml
+++ b/plugins/kotlin/plugin/common/resources/META-INF/jvm-debugger.xml
@@ -28,6 +28,8 @@
   <extensions defaultExtensionNs="com.intellij">
     <debugger.creationStackTraceProvider implementation="org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineAsyncStackTraceProvider"/>
     <debugger.dumpItemsProvider implementation="org.jetbrains.kotlin.idea.debugger.coroutine.view.CoroutinesDumpAsyncProvider"/>
+    <registryKey key="debugger.kotlin.show.coroutines.in.threadDumpPanel" defaultValue="true"
+                 description="Merge coroutine dump with thread dump in ThreadDumpPanel"/>
 
     <runConfigurationExtension implementation="org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineDebugConfigurationExtension"/>
 
@@ -38,6 +40,8 @@
     <applicationService
             serviceInterface="org.jetbrains.kotlin.idea.debugger.core.StackFrameInterceptor"
             serviceImplementation="org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineStackFrameInterceptor"/>
+    <registryKey key="debugger.kotlin.auto.show.coroutines.view" defaultValue="false"
+                 description="Automatically open coroutines view if stack trace contains coroutine stack frames"/>
 
     <xdebugger.settings implementation="org.jetbrains.kotlin.idea.debugger.KotlinDebuggerSettings"/>
     <xdebugger.breakpointType implementation="org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinFieldBreakpointType"/>
@@ -47,7 +51,7 @@
     <debugger.compoundRendererProvider id="KotlinClassRendererProvider"
                                        implementation="org.jetbrains.kotlin.idea.debugger.core.render.KotlinClassRendererProvider"/>
     <debugger.positionManagerFactory implementation="org.jetbrains.kotlin.idea.debugger.core.KotlinPositionManagerFactory"/>
-
+    <registryKey key="debugger.kotlin.inline.stack.trace.enabled" defaultValue="true" description="Enable inline stack trace"/>
 
     <debugger.sourcePositionHighlighter implementation="org.jetbrains.kotlin.idea.debugger.core.KotlinSourcePositionHighlighter"/>
     <debugger.sourcePositionProvider implementation="org.jetbrains.kotlin.idea.debugger.core.KotlinSourcePositionProvider"/>
@@ -64,6 +68,8 @@
     <debuggerEditorTextProvider
             language="kotlin"
             implementationClass="org.jetbrains.kotlin.idea.debugger.core.EnclosingKotlinEditorTextProvider"/>
+    <registryKey key="debugger.kotlin.analysis.api.editor.text.provider" defaultValue="true"
+                 description="Use Analysis API-based implementation of 'EditorTextProvider'"/>
 
     <debuggerClassFilterProvider implementation="org.jetbrains.kotlin.idea.debugger.core.filter.KotlinDebuggerInternalClassesFilterProvider"/>
 
@@ -100,5 +106,21 @@
             description="Use Analysis API-based implementation for file applicability checker"
             defaultValue="false"
             restartRequired="false"/>
+    <registryKey
+            key="debugger.kotlin.multiline.lambda.breakpoints"
+            defaultValue="false"
+            description="Allow installing breakpoint on multiline lambdas"/>
+    <registryKey
+            key="debugger.kotlin.report.smart.step.into.targets.detection.failure"
+            defaultValue="true"
+            description="Report an error when smart targets detection in bytecode failed (leads to a failure in tests)"/>
+    <registryKey
+            key="debugger.kotlin.step.through.inline.lambdas"
+            defaultValue="true"
+            description="Step over action steps into inline lambdas (e.g., calls of let/run/synchronized/...)"/>
+    <registryKey
+            key="debugger.enable.kotlin.evaluator.in.java.context"
+            defaultValue="false"
+            description="Enable Kotlin evaluation features when hitting/suspending in Java frames (suggest Kotlin language in evaluation prompts, conditional breakpoints, and 'Evaluate and log' field; support Kotlin watches)"/>
   </extensions>
 </idea-plugin>
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index 4afb144fc743..1e3b0e8a635e 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -79,6 +79,9 @@
   <extensions defaultExtensionNs="com.intellij">
     <postStartupActivity implementation="org.jetbrains.idea.maven.project.MavenProjectsManagerProjectActivity"/>
 
+    <registryKey key="MAVEN.system.in.process" defaultValue="true"
+                 description="Whether IDEA should use 'in-process' mode for interaction with Maven API"/>
+
     <pathMacroContributor implementation="org.jetbrains.idea.maven.utils.MavenPathMacroContributor"/>
     <projectPathMacroContributor implementation="org.jetbrains.idea.maven.utils.MavenProjectPathMacroContributor"/>
     <buildProcess.parametersProvider implementation="org.jetbrains.idea.maven.utils.MavenBuildProcessParameterProvider"/>
diff --git a/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml b/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
index a21af3c53a65..1dd8037757f3 100644
--- a/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
+++ b/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
@@ -93,6 +93,9 @@
                              instance="com.intellij.pycharm.community.ide.impl.settings.MemoryUsageConfigurable"
                              groupId="root"/>
 
+    <registryKey key="dataspell.interpreter.widget" defaultValue="true"
+                 description="Interpreter widget for lightweight interpreter management"/>
+
     <statusBarWidgetFactory id="pythonInterpreterWidget"
                             implementation="com.intellij.pycharm.community.ide.impl.configuration.PySdkStatusBarWidgetFactory"
                             order="after CodeStyleStatusBarWidget, before git, before hg, before Notifications"/>