diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index bb24ed68432..204cf4e45f6 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1605,7 +1605,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ObjectLiteralToLambdaInspection"
                      displayName="Object literal can be converted to lambda"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="INFO"
                      language="kotlin"
@@ -1613,7 +1614,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.SimplifyAssertNotNullInspection"
                      displayName="‘assert’ call can be replaced with ‘!!’ or ‘?:'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="INFO"
                      language="kotlin"
@@ -1621,7 +1623,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.DeprecatedCallableAddReplaceWithInspection"
                      displayName="@Deprecated annotation without 'replaceWith' argument"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Other problems"
                      enabledByDefault="true"
                      level="INFO"
                      language="kotlin"
@@ -1629,7 +1632,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ConvertToStringTemplateInspection"
                      displayName="String concatenation that can be converted to string template"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="INFO"
                      language="kotlin"
@@ -1637,7 +1641,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceGetOrSetInspection"
                      displayName="Explicit 'get' or 'set' call"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="INFO"
                      language="kotlin"
@@ -1645,7 +1650,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisInspection"
                      displayName="If-Then foldable to '?:'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1653,7 +1659,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToSafeAccessInspection"
                      displayName="If-Then foldable to '?.'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1661,7 +1668,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.FoldInitializerAndIfToElvisInspection"
                      displayName="If-Null return/break/... foldable to '?:'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1669,7 +1677,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArgumentsInspection"
                      displayName="Unnecessary type argument"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1677,7 +1686,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveExplicitSuperQualifierInspection"
                      displayName="Unnecessary supertype qualification"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1685,7 +1695,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionInspection"
                      displayName="Negated boolean expression that can be simplified"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1693,7 +1704,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignmentInspection"
                      displayName="Assignment that can be replaced with operator assignment"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1701,7 +1713,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IntroduceWhenSubjectInspection"
                      displayName="'when' that can be simplified by introducing an argument"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1709,7 +1722,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateInspection"
                      displayName="Redundant curly braces in string template"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1717,7 +1731,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.SimplifyBooleanWithConstantsInspection"
                      displayName="Boolean expression that can be simplified"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1726,7 +1741,8 @@
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.UsePropertyAccessSyntaxInspection"
                      displayName="Accessor call that can be replaced with property access syntax"
                      shortName="UsePropertyAccessSyntax"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      cleanupTool="true"
                      enabledByDefault="true"
                      level="WEAK WARNING"
@@ -1735,7 +1751,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.UnusedSymbolInspection"
                      displayName="Unused symbol"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      runForWholeFile="true"
@@ -1744,7 +1761,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.UnusedReceiverParameterInspection"
                      displayName="Unused receiver parameter"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1752,7 +1770,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinUnusedImportInspection"
                      displayName="Unused import directive"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      runForWholeFile="true"
@@ -1761,7 +1780,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantSamConstructorInspection"
                      displayName="Redundant SAM constructor"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1769,7 +1789,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.UnsafeCastFromDynamicInspection"
                      displayName="Implicit (unsafe) cast from dynamic type"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="INFO"
                      language="kotlin"
@@ -1778,7 +1799,8 @@
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.OverridingDeprecatedMemberInspection"
                      shortName="OverridingDeprecatedMember"
                      displayName="Overriding deprecated member"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Other problems"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1786,7 +1808,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.kdoc.KDocUnresolvedReferenceInspection"
                      displayName="Unresolved reference in KDoc"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1794,7 +1817,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.kdoc.KDocMissingDocumentationInspection"
                      displayName="Missing KDoc comments for public declarations"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Other problems"
                      enabledByDefault="false"
                      level="WARNING"
                      language="kotlin"
@@ -1802,7 +1826,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.refactoring.move.changePackage.PackageDirectoryMismatchInspection"
                      displayName="Package name does not match containing directory"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Java interop issues"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1811,7 +1836,8 @@
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinCleanupInspection"
                      shortName="KotlinDeprecation"
                      displayName="Usage of redundant or deprecated syntax or deprecated symbols"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Other problems"
                      enabledByDefault="true"
                      cleanupTool="true"
                      level="WARNING"
@@ -1820,7 +1846,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveForLoopIndicesInspection"
                      displayName="Unused loop index"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1828,29 +1855,33 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.loopToCallChain.LoopToCallChainInspection"
                      displayName="Loop can be replaced with stdlib operations"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="INFO"
     />
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.loopToCallChain.UseWithIndexInspection"
                      displayName="Manually incremented index variable can be replaced with use of 'withIndex()'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="INFO"
     />
 
-      <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.ConflictingExtensionPropertyInspection"
-                       displayName="Extension property conflicting with synthetic one"
-                       groupName="Kotlin"
-                       enabledByDefault="true"
-                       level="WARNING"
-                       language="kotlin"
-      />
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.ConflictingExtensionPropertyInspection"
+                     displayName="Extension property conflicting with synthetic one"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
+                     enabledByDefault="true"
+                     level="WARNING"
+                     language="kotlin"
+    />
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.EqualsOrHashCodeInspection"
                      displayName="equals() and hashCode() not paired"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1858,7 +1889,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantVisibilityModifierInspection"
                      displayName="Redundant visibility modifier"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      cleanupTool="true"
                      level="WARNING"
@@ -1867,7 +1899,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.DestructureInspection"
                      displayName="Use destructuring declaration"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      cleanupTool="false"
                      level="INFO"
@@ -1876,7 +1909,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.CanBeValInspection"
                      displayName="Local 'var' is never modified and can be declared as 'val'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1884,7 +1918,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.ArrayInDataClassInspection"
                      displayName="Array property in data class"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1892,7 +1927,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.ProtectedInFinalInspection"
                      displayName="'protected' visibility is effectively 'private' in a final class"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1900,7 +1936,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection"
                      displayName="Type parameter can have 'in' or 'out' variance"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1908,7 +1945,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.CanBeParameterInspection"
                      displayName="Constructor parameter is never used as a property"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1916,7 +1954,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantModalityModifierInspection"
                      displayName="Redundant modality modifier"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      cleanupTool="true"
                      level="WARNING"
@@ -1925,7 +1964,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantSemicolonInspection"
                      displayName="Redundant semicolon"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      cleanupTool="true"
                      level="WARNING"
@@ -1934,7 +1974,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantIfInspection"
                      displayName="Redundant 'if' statement"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      cleanupTool="true"
                      level="WEAK WARNING"
@@ -1943,7 +1984,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.LeakingThisInspection"
                      displayName="Leaking 'this' in constructor"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1951,7 +1993,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.HasPlatformTypeInspection"
                      displayName="Function or property has platform type"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Java interop issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -1959,7 +2002,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.CanBePrimaryConstructorPropertyInspection"
                      displayName="Property is explicitly assigned to constructor parameter"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1967,7 +2011,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveAtFromAnnotationArgumentInspection"
                      displayName="Unnecessary @"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1975,7 +2020,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ConvertLambdaToReferenceInspection"
                      displayName="Can be replaced with function reference"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="INFORMATION"
                      language="kotlin"
@@ -1983,7 +2029,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ConvertReferenceToLambdaInspection"
                      displayName="Can be replaced with lambda"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="INFORMATION"
                      language="kotlin"
@@ -1991,7 +2038,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveSetterParameterTypeInspection"
                      displayName="Redundant setter parameter type"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -1999,7 +2047,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceCallWithComparisonInspection"
                      displayName="Can be replaced with comparison"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2007,7 +2056,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveSingleExpressionStringTemplateInspection"
                      displayName="Remove redundant string template"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2015,7 +2065,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RemoveToStringInStringTemplateInspection"
                      displayName="Remove redundant call to 'toString()' in string template"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2023,7 +2074,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveEmptyParenthesesFromLambdaCallInspection"
                      displayName="Remove unnecessary parentheses from function call with lambda"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="INFO"
                      language="kotlin"
@@ -2031,7 +2083,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ReplaceArrayEqualityOpWithArraysEqualsInspection"
                      displayName="Replace '==' with 'Arrays.equals'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2039,7 +2092,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ReplaceSingleLineLetInspection"
                      displayName="Replace single line .let"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2047,7 +2101,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ConvertSecondaryConstructorToPrimaryInspection"
                      displayName="Convert to primary constructor"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2055,7 +2110,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ReplaceSizeCheckWithIsNotEmptyInspection"
                      displayName="Replace size check with 'isNotEmpty()'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2063,7 +2119,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ReplaceSizeZeroCheckWithIsEmptyInspection"
                      displayName="Replace size zero check with 'isEmpty()'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2071,7 +2128,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveEmptyClassBodyInspection"
                      displayName="Replace empty class body"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      cleanupTool="true"
                      level="INFO"
@@ -2080,7 +2138,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveRedundantCallsOfConversionMethodsInspection"
                      displayName="Remove redundant calls of conversion methods"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2088,7 +2147,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveEmptyPrimaryConstructorInspection"
                      displayName="Remove empty primary constructor"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2096,7 +2156,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveEmptySecondaryConstructorBodyInspection"
                      displayName="Remove empty constructor body"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2104,7 +2165,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.JoinDeclarationAndAssignmentInspection"
                      displayName="Join declaration and assignment"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2112,7 +2174,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ConvertTryFinallyToUseCallInspection"
                      displayName="Convert try / finally to use() call"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2120,7 +2183,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ConvertTwoComparisonsToRangeCheckInspection"
                      displayName="Convert two comparisons to 'in'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2128,7 +2192,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.UnusedEqualsInspection"
                      displayName="Unused equals expression"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2136,7 +2201,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.DataClassPrivateConstructorInspection"
                      displayName="Private data class constructor is exposed via the 'copy' method"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2144,7 +2210,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.DestructuringWrongNameInspection"
                      displayName="Variable in destructuring declaration uses name of a wrong data class property"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2152,7 +2219,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.UnusedLambdaExpressionBodyInspection"
                      displayName="Unused return value of a function with lambda expression body"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2160,7 +2228,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinInternalInJavaInspection"
                      displayName="Usage of Kotlin internal declarations from Java"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Java interop issues"
                      enabledByDefault="true"
                      level="ERROR"
                      language="JAVA"
@@ -2168,7 +2237,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.MoveSuspiciousCallableReferenceIntoParenthesesInspection"
                      displayName="Suspicious callable reference used as lambda result"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2176,7 +2246,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.CopyWithoutNamedArgumentsInspection"
                      displayName="'copy' method of data class is called without named arguments"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2184,7 +2255,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.ReplaceArrayOfWithLiteralInspection"
                      displayName="'arrayOf' call can be replaced with array literal [...]"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2192,7 +2264,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RecursivePropertyAccessorInspection"
                      displayName="Recursive property accessor"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2200,7 +2273,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.ReplaceRangeToWithUntilInspection"
                      displayName="'rangeTo' or the '..' call can be replaced with 'until'"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2208,7 +2282,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.MemberVisibilityCanPrivateInspection"
                      displayName="Class member can have 'private' visibility"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="INFO"
                      language="kotlin"
@@ -2216,7 +2291,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.NullableBooleanElvisInspection"
                      displayName="Equality check can be used instead of elvis"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2224,7 +2300,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.WrapUnaryOperatorInspection"
                      displayName="Ambiguous unary operator use with number constant"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
@@ -2232,7 +2309,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.EmptyRangeInspection"
                      displayName="Range with start greater than endInclusive is empty"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2240,7 +2318,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RemoveRedundantSpreadOperatorInspection"
                      displayName="Redundant spread operator"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Redundant constructs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2248,7 +2327,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.UselessCallOnNotNullInspection"
                      displayName="Useless call on not-null type"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2256,7 +2336,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantExplicitTypeInspection"
                      displayName="Explicitly given type is redundant here"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2264,7 +2345,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.UselessCallOnCollectionInspection"
                      displayName="Useless call on collection type"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Probable bugs"
                      enabledByDefault="true"
                      level="WARNING"
                      language="kotlin"
@@ -2272,7 +2354,8 @@
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.collections.SimplifiableCallChainInspection"
                      displayName="Call chain on collection type can be simplified"
-                     groupName="Kotlin"
+                     groupPath="Kotlin"
+                     groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"