diff --git a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
index 2252212c15ee..be0773055a17 100644
--- a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
+++ b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
@@ -629,5 +629,4 @@ intention.name.remove.repeating.call=Remove repeating call ''{0}()''
 intention.family.name.replace.with.expression=Replace with expression
 intention.name.make.variable.effectively.final=Make variable effectively final
 
-uast.language.display.name=JVM languages
-dialog.progress.collect.members.to.generate=Collect Members...
\ No newline at end of file
+uast.language.display.name=JVM languages
\ No newline at end of file
diff --git a/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties b/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties
index e8df4d823cf8..4c198b088679 100644
--- a/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties
+++ b/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties
@@ -2571,4 +2571,5 @@ notification.text.kotlin.js.compiler.learn.more=Learn more
 notification.text.kotlin.js.compiler.link=https://kotl.in/jsirstable
 find.usages.prepare.dialog.progress=Prepare dialog
 
-replace.overloaded.operator.with.function.call=Replace overloaded operator with function call
\ No newline at end of file
+replace.overloaded.operator.with.function.call=Replace overloaded operator with function call
+dialog.progress.collect.members.to.generate=Collect Members...
\ No newline at end of file
diff --git a/plugins/kotlin/code-insight/override-implement-shared/kotlin.code-insight.override-implement-shared.iml b/plugins/kotlin/code-insight/override-implement-shared/kotlin.code-insight.override-implement-shared.iml
index a1bf05c34160..7dfe5b6c1a56 100644
--- a/plugins/kotlin/code-insight/override-implement-shared/kotlin.code-insight.override-implement-shared.iml
+++ b/plugins/kotlin/code-insight/override-implement-shared/kotlin.code-insight.override-implement-shared.iml
@@ -14,5 +14,6 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="kotlin.base.resources" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/code-insight/override-implement-shared/src/org/jetbrains/kotlin/idea/core/overrideImplement/AbstractGenerateMembersHandler.kt b/plugins/kotlin/code-insight/override-implement-shared/src/org/jetbrains/kotlin/idea/core/overrideImplement/AbstractGenerateMembersHandler.kt
index 73a8ca83062c..c551ef72d65f 100644
--- a/plugins/kotlin/code-insight/override-implement-shared/src/org/jetbrains/kotlin/idea/core/overrideImplement/AbstractGenerateMembersHandler.kt
+++ b/plugins/kotlin/code-insight/override-implement-shared/src/org/jetbrains/kotlin/idea/core/overrideImplement/AbstractGenerateMembersHandler.kt
@@ -6,7 +6,6 @@ import com.intellij.codeInsight.FileModificationService
 import com.intellij.codeInsight.generation.ClassMember
 import com.intellij.codeInsight.hint.HintManager
 import com.intellij.ide.util.MemberChooser
-import com.intellij.java.analysis.JavaAnalysisBundle
 import com.intellij.lang.LanguageCodeInsightActionHandler
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.editor.Editor
@@ -16,7 +15,9 @@ import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.util.NlsContexts
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiFile
+import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import org.jetbrains.annotations.ApiStatus
+import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
 import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
@@ -29,10 +30,11 @@ abstract class AbstractGenerateMembersHandler<T : ClassMember> : LanguageCodeIns
     fun collectMembersToGenerateUnderProgress(classOrObject: KtClassOrObject): Collection<T> {
         return ProgressManager.getInstance().runProcessWithProgressSynchronously<Collection<T>, RuntimeException>(
             { runReadAction { collectMembersToGenerate(classOrObject) } },
-            JavaAnalysisBundle.message("dialog.progress.collect.members.to.generate"), true, classOrObject.project
+            KotlinBundle.message("dialog.progress.collect.members.to.generate"), true, classOrObject.project
         )
     }
 
+    @RequiresBackgroundThread(generateAssertion = false)
     abstract fun collectMembersToGenerate(classOrObject: KtClassOrObject): Collection<T>
 
     abstract fun generateMembers(editor: Editor, classOrObject: KtClassOrObject, selectedElements: Collection<T>, copyDoc: Boolean)