diff --git a/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml b/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml
index 59c22ecac25e..3a92add337f0 100644
--- a/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml
+++ b/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml
@@ -55,5 +55,7 @@
     <orderEntry type="module" module-name="kotlin.base.analysis" />
     <orderEntry type="module" module-name="kotlin.base.facet" />
     <orderEntry type="module" module-name="kotlin.refactorings.move.k2" />
+    <orderEntry type="module" module-name="kotlin.code-insight.override-implement.shared" />
+    <orderEntry type="module" module-name="kotlin.code-insight.override-implement.k2" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/code-insight/intentions-k2/resources/kotlin.code-insight.intentions.k2.xml b/plugins/kotlin/code-insight/intentions-k2/resources/kotlin.code-insight.intentions.k2.xml
index b58786230949..e2a3701deff6 100644
--- a/plugins/kotlin/code-insight/intentions-k2/resources/kotlin.code-insight.intentions.k2.xml
+++ b/plugins/kotlin/code-insight/intentions-k2/resources/kotlin.code-insight.intentions.k2.xml
@@ -386,5 +386,12 @@
       <bundleName>messages.KotlinBundle</bundleName>
       <categoryKey>group.names.kotlin</categoryKey>
     </intentionAction>
+
+    <intentionAction>
+      <language>kotlin</language>
+      <className>org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention</className>
+      <bundleName>messages.KotlinBundle</bundleName>
+      <categoryKey>group.names.kotlin</categoryKey>
+    </intentionAction>
   </extensions>
 </idea-plugin>
diff --git a/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/CreateKotlinSubClassIntention.kt b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/CreateKotlinSubClassIntention.kt
new file mode 100644
index 000000000000..d45cd9f684f2
--- /dev/null
+++ b/plugins/kotlin/code-insight/intentions-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/intentions/CreateKotlinSubClassIntention.kt
@@ -0,0 +1,40 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.k2.codeinsight.intentions
+
+import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.impl.Utils.computeWithProgressIcon
+import com.intellij.openapi.application.readAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiDirectory
+import com.intellij.ui.awt.RelativePoint
+import org.jetbrains.kotlin.idea.codeinsights.impl.base.intentions.CreateKotlinSubClassIntentionBase
+import org.jetbrains.kotlin.idea.core.overrideImplement.KtImplementMembersHandler
+import org.jetbrains.kotlin.idea.k2.refactoring.move.processor.getOrCreateKotlinFile
+import org.jetbrains.kotlin.psi.KtClass
+import org.jetbrains.kotlin.psi.KtFile
+
+internal class CreateKotlinSubClassIntention : CreateKotlinSubClassIntentionBase() {
+
+    override fun chooseAndImplementMethods(
+      project: Project,
+      targetClass: KtClass,
+      editor: Editor,
+    ) {
+        val offset = targetClass.textRange.startOffset.also { editor.caretModel.moveToOffset(it) }
+        val aComponent = editor.contentComponent
+        val point = RelativePoint(aComponent, editor.logicalPositionToXY(editor.offsetToLogicalPosition(offset)))
+        val collectMembersToGenerate = computeWithProgressIcon(point, aComponent, ActionPlaces.UNKNOWN) {
+            readAction { KtImplementMembersHandler().collectMembersToGenerate(targetClass) }
+        }
+        KtImplementMembersHandler().generateMembers(editor, targetClass, collectMembersToGenerate, copyDoc = true)
+    }
+
+    override fun shortenReferences(klass: KtClass) {
+        shortenReferences(klass)
+    }
+
+    override fun getOrCreateKtFile(fileName: String, targetDir: PsiDirectory): KtFile {
+        return getOrCreateKotlinFile(fileName, targetDir)
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt
index 2e52ac932c00..300a9b52db41 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt
@@ -8,4 +8,4 @@ private abstract class <caret>Base {
     abstract fun toInt(arg: String): Int
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt.after
index e537839cf3a7..05307deeca26 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt.after
@@ -18,4 +18,4 @@ private class BaseImpl : Base() {
     }
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inCompanion.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/inCompanion.kt
index a6c3adf65aac..f6c89a0a9061 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inCompanion.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inCompanion.kt
@@ -8,4 +8,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inCompanion.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/inCompanion.kt.after
index 7fcdb99374a6..9cd541f34bbd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inCompanion.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inCompanion.kt.after
@@ -10,4 +10,4 @@ class Container {
 class BaseImpl : Container.Companion.Base()
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inInternalCompanion.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/inInternalCompanion.kt
index 3297e5ffb2af..8de581464db9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inInternalCompanion.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inInternalCompanion.kt
@@ -8,4 +8,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inInternalCompanion.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/inInternalCompanion.kt.after
index a699e1463346..a946add0494e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inInternalCompanion.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inInternalCompanion.kt.after
@@ -10,4 +10,4 @@ class Container {
 internal class BaseImpl : Container.Companion.Base()
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inPrivateCompanion.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/inPrivateCompanion.kt
index ff4a81aaa4dc..49a1bebda107 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inPrivateCompanion.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inPrivateCompanion.kt
@@ -8,4 +8,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inPrivateCompanion.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/inPrivateCompanion.kt.after
index 0e55f2ea100d..2d98857d4b79 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inPrivateCompanion.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inPrivateCompanion.kt.after
@@ -10,4 +10,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inProtectedCompanion.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/inProtectedCompanion.kt
index 704354ee0536..b1859189161d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inProtectedCompanion.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inProtectedCompanion.kt
@@ -8,4 +8,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inProtectedCompanion.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/inProtectedCompanion.kt.after
index d91d8389b4db..06d95e5e0d95 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inProtectedCompanion.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inProtectedCompanion.kt.after
@@ -10,4 +10,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt
index aa77905d865a..1d61837696e2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt
@@ -9,4 +9,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt.after
index 1f46da453ebe..05104a7f62b8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt.after
@@ -15,4 +15,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt
index 14d5a504ba9f..01207f30e078 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt
@@ -9,4 +9,4 @@ interface <caret>Base {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt.after
index f6c82e830c9b..b584bb639bc8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt.after
@@ -15,4 +15,4 @@ class BaseImpl : Base {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt
index 97696cee06ad..a202fa5bb1c2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt
@@ -17,4 +17,4 @@ class Container {
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt.after
index 960dbc17f545..dcab9cca1817 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt.after
@@ -26,4 +26,4 @@ class BaseImpl : Container.Base {
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt
index d787717dfc11..22699b7646fc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt
@@ -8,4 +8,4 @@ class Container {
     }
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt.after
index ef45ee612519..f59e99bd18c4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt.after
@@ -14,4 +14,4 @@ class Container {
     }
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/private.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/private.kt
index 8589a4cccac9..e51003f1b3b0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/private.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/private.kt
@@ -3,4 +3,4 @@
 
 private open class <caret>Base
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/private.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/private.kt.after
index 31350f6488dc..7d455b519556 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/private.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/private.kt.after
@@ -4,4 +4,4 @@
 private open class Base
 private class BaseImpl : Base()
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNested.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNested.kt
index 050a357333ff..7fd7768d58fb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNested.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNested.kt
@@ -10,4 +10,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNested.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNested.kt.after
index 10675b411c4e..8a68691fb0bf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNested.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNested.kt.after
@@ -12,4 +12,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNestedWithConflict.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNestedWithConflict.kt
index 5f65e27aba87..b53a7943a0b4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNestedWithConflict.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNestedWithConflict.kt
@@ -12,4 +12,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNestedWithConflict.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNestedWithConflict.kt.after
index dd2d3795e5bc..65c39e827cc1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNestedWithConflict.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/privateNestedWithConflict.kt.after
@@ -14,4 +14,4 @@ class Container {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/protected.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/protected.kt
index b1a6a57321f8..156ee192a3f3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/protected.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/protected.kt
@@ -5,4 +5,4 @@ class Container {
     protected abstract class <caret>Base
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/protected.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/protected.kt.after
index 2ac803cecbd9..3eb549e59c40 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/protected.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/protected.kt.after
@@ -6,4 +6,4 @@ class Container {
     protected class BaseImpl : Base()
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt
index 1d10d3301df4..f2a3a811beee 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt
@@ -7,4 +7,4 @@ sealed class <caret>Base {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt.after
index 464bfdd6ccec..24627666bb09 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt.after
@@ -13,4 +13,4 @@ class BaseImpl : Base() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedAfter15.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedAfter15.kt
index 35f469d48d20..c843473776c6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedAfter15.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedAfter15.kt
@@ -7,4 +7,4 @@ sealed class <caret>Base {
     abstract fun foo(): Int
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedAfter15.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedAfter15.kt.after
index 645f7c2d54f8..52a468bbda86 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedAfter15.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedAfter15.kt.after
@@ -13,4 +13,4 @@ class BaseImpl : Base() {
     }
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmpty.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmpty.kt
index decb4d3fcee2..dd0f2503791b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmpty.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmpty.kt
@@ -4,4 +4,4 @@
 sealed class <caret>Sealed
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmpty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmpty.kt.after
index e81014f9645b..bc6b8219b7cf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmpty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmpty.kt.after
@@ -5,4 +5,4 @@ sealed class Sealed
 class SealedImpl : Sealed()
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmptyAfter15.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmptyAfter15.kt
index 251c8e078e1d..6aa74dce01d9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmptyAfter15.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmptyAfter15.kt
@@ -3,4 +3,4 @@
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces
 sealed class <caret>Sealed
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmptyAfter15.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmptyAfter15.kt.after
index f86dbb0a4062..da264e721568 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmptyAfter15.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedEmptyAfter15.kt.after
@@ -4,4 +4,4 @@
 sealed class Sealed
 <caret>class SealedImpl : Sealed()
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt
index 6657e2961684..aab4013acefd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt
@@ -11,4 +11,4 @@ sealed class <caret>Base {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt.after
index ac1da68341d1..ede029686bac 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt.after
@@ -17,4 +17,4 @@ class BaseImpl : Base() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflictAfter15.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflictAfter15.kt
index 547f7e9ee0b2..e55a64c8e93c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflictAfter15.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflictAfter15.kt
@@ -11,4 +11,4 @@ sealed class <caret>Base {
     }
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflictAfter15.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflictAfter15.kt.after
index d7748ec20778..90ddc6f391e4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflictAfter15.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflictAfter15.kt.after
@@ -17,4 +17,4 @@ class BaseImpl : Base() {
     }
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameter.kt
index 55da413ca726..91f2d8972243 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameter.kt
@@ -3,4 +3,4 @@
 
 interface <caret>Base<T : Any>
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameter.kt.after
index 8db87e393c51..a5b96f0f3191 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameter.kt.after
@@ -4,4 +4,4 @@
 interface Base<T : Any>
 class BaseImpl<T : Any> : Base<T>
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterOut.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterOut.kt
index f6578880a018..d5d16052ad51 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterOut.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterOut.kt
@@ -3,4 +3,4 @@
 
 interface <caret>Base<out T>
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterOut.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterOut.kt.after
index ffd03c233e9d..835de460a16d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterOut.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterOut.kt.after
@@ -4,4 +4,4 @@
 interface Base<out T>
 class BaseImpl<out T> : Base<T>
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterWhere.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterWhere.kt
index 81b79d99e963..ebd251874bf3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterWhere.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterWhere.kt
@@ -3,4 +3,4 @@
 
 interface <caret>Base<T> where T : Any
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterWhere.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterWhere.kt.after
index 6a14218fa5f9..8582f408e525 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterWhere.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParameterWhere.kt.after
@@ -4,4 +4,4 @@
 interface Base<T> where T : Any
 class BaseImpl<T> : Base<T> where T : Any
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParametersClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParametersClass.kt
index 125776f0edb2..c665e650fb36 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParametersClass.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParametersClass.kt
@@ -3,4 +3,4 @@
 
 open class <caret>Base<T : Any, L : List<T>>
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParametersClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParametersClass.kt.after
index fd551e32c595..5fe3d001b6a8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParametersClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/typeParametersClass.kt.after
@@ -4,4 +4,4 @@
 open class Base<T : Any, L : List<T>>
 class BaseImpl<T : Any, L : List<T>> : Base<T, L>()
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.CreateKotlinSubClassIntention
-/* IGNORE_K2 */
\ No newline at end of file
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.CreateKotlinSubClassIntention
\ No newline at end of file