diff --git a/ChangeLog.md b/ChangeLog.md
index 162645720dc..c333ed6cc2c 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -16,6 +16,7 @@ New features:
 - [KT-11768](https://youtrack.jetbrains.com/issue/KT-11768) Implement "Introduce local variable" intention
 - [KT-11692](https://youtrack.jetbrains.com/issue/KT-11692) Support Spring model diagrams for Kotlin classes
 - [KT-11574](https://youtrack.jetbrains.com/issue/KT-11574) Support predefined Java positions for language injection
+- [KT-11807](https://youtrack.jetbrains.com/issue/KT-11807) Use function body template when generating overriding functions with default body
 
 Issues fixed:
 
diff --git a/idea/idea-completion/testData/handlers/basic/override/ImplementFunction.kt.after b/idea/idea-completion/testData/handlers/basic/override/ImplementFunction.kt.after
index 07ca0c5164e..02a6bd1ca05 100644
--- a/idea/idea-completion/testData/handlers/basic/override/ImplementFunction.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/override/ImplementFunction.kt.after
@@ -4,7 +4,7 @@ interface I {
 
 class A : I {
     override fun foo(p: Int) {
-        <caret><selection>throw UnsupportedOperationException()</selection>
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/idea-completion/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after b/idea/idea-completion/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after
index bc587464227..7a9b7678e24 100644
--- a/idea/idea-completion/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after
+++ b/idea/idea-completion/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after
@@ -1,7 +1,7 @@
 fun<T> f(){
     JavaClass<T>(object: Comparator<T> {
         override fun compare(var1: T, var2: T): Int {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     })
 }
diff --git a/idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt.after b/idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt.after
index 5df2f1119b2..4d9981c24fa 100644
--- a/idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt.after
+++ b/idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt.after
@@ -1,6 +1,6 @@
 var r : Runnable = object: Runnable {
     override fun run() {
-        <caret><selection>throw UnsupportedOperationException()</selection>
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after b/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after
index 94e8d5e60da..1d9d6057157 100644
--- a/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after
+++ b/idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after
@@ -2,7 +2,7 @@ import java.io.Closeable
 
 val c: java.io.Closeable = object: Closeable {
     override fun close() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt.after b/idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt.after
index 1af95c85ca4..d38d05fa95a 100644
--- a/idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt.after
+++ b/idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt.after
@@ -3,7 +3,7 @@ fun registerHandler(handler: Handler<out Message>) {}
 fun test() {
     registerHandler(object: Handler<Message> {
         override fun handle(e: Message) {
-            <caret><selection>throw UnsupportedOperationException()</selection>
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     })
 }
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt
index 8e6106490f0..c7b9cc02886 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt
@@ -24,6 +24,8 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
+import org.jetbrains.kotlin.idea.core.TemplateKind
+import org.jetbrains.kotlin.idea.core.getFunctionBodyTextFromTemplate
 import org.jetbrains.kotlin.idea.core.util.DescriptorMemberChooserObject
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.psi.*
@@ -115,7 +117,7 @@ private fun generateProperty(project: Project, descriptor: PropertyDescriptor, b
     val body = buildString {
         append("\nget()")
         append(" = ")
-        append(generateUnsupportedOrSuperCall(descriptor, bodyType))
+        append(generateUnsupportedOrSuperCall(project, descriptor, bodyType))
         if (descriptor.isVar) {
             append("\nset(value) {}")
         }
@@ -139,17 +141,26 @@ private fun generateFunction(project: Project, descriptor: FunctionDescriptor, b
     val returnsNotUnit = returnType != null && !KotlinBuiltIns.isUnit(returnType)
 
     val body = if (bodyType != OverrideMemberChooserObject.BodyType.NO_BODY) {
-        val delegation = generateUnsupportedOrSuperCall(descriptor, bodyType)
-        "{" + (if (returnsNotUnit && bodyType != OverrideMemberChooserObject.BodyType.EMPTY) "return " else "") + delegation + "}"
+        val delegation = generateUnsupportedOrSuperCall(project, descriptor, bodyType)
+        "{" + (if (returnsNotUnit && bodyType != OverrideMemberChooserObject.BodyType.EMPTY) "return " else "") + delegation + "\n}"
     }
     else ""
 
     return KtPsiFactory(project).createFunction(OVERRIDE_RENDERER.render(newDescriptor) + body)
 }
 
-fun generateUnsupportedOrSuperCall(descriptor: CallableMemberDescriptor, bodyType: OverrideMemberChooserObject.BodyType): String {
+fun generateUnsupportedOrSuperCall(
+        project: Project,
+        descriptor: CallableMemberDescriptor,
+        bodyType: OverrideMemberChooserObject.BodyType
+): String {
     if (bodyType == OverrideMemberChooserObject.BodyType.EMPTY) {
-        return "throw UnsupportedOperationException()"
+        if (descriptor !is FunctionDescriptor) return "throw UnsupportedOperationException()"
+        return getFunctionBodyTextFromTemplate(project,
+                                               TemplateKind.FUNCTION,
+                                               descriptor.name.asString(),
+                                               descriptor.returnType?.let { IdeDescriptorRenderers.SOURCE_CODE.renderType(it) } ?: "Unit",
+                                               null)
     }
     else {
         return buildString {
@@ -165,7 +176,7 @@ fun generateUnsupportedOrSuperCall(descriptor: CallableMemberDescriptor, bodyTyp
                     val renderedName = it.name.render()
                     if (it.varargElementType != null) "*$renderedName" else renderedName
                 }
-                paramTexts.joinTo(this, prefix="(", postfix=")")
+                paramTexts.joinTo(this, prefix = "(", postfix = ")")
             }
         }
     }
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt
new file mode 100644
index 00000000000..0fca809ce91
--- /dev/null
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/templates.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.core
+
+import com.intellij.ide.fileTemplates.FileTemplate
+import com.intellij.ide.fileTemplates.FileTemplateManager
+import com.intellij.openapi.progress.ProcessCanceledException
+import com.intellij.openapi.project.Project
+import com.intellij.util.IncorrectOperationException
+import org.jetbrains.kotlin.name.FqName
+import java.util.*
+
+private val FUNCTION_BODY_TEMPLATE = "New Kotlin Function Body.kt"
+private val SECONDARY_CONSTRUCTOR_BODY_TEMPLATE = "New Kotlin Secondary Constructor Body.kt"
+private val ATTRIBUTE_FUNCTION_NAME = "FUNCTION_NAME"
+
+enum class TemplateKind(val templateFileName: String) {
+    FUNCTION(FUNCTION_BODY_TEMPLATE), SECONDARY_CONSTRUCTOR(SECONDARY_CONSTRUCTOR_BODY_TEMPLATE)
+}
+
+fun getFunctionBodyTextFromTemplate(
+        project: Project,
+        kind: TemplateKind,
+        name: String?,
+        returnType: String,
+        classFqName: FqName? = null
+): String {
+    val fileTemplate = FileTemplateManager.getInstance(project)!!.getCodeTemplate(kind.templateFileName)
+
+    val properties = Properties()
+    properties.setProperty(FileTemplate.ATTRIBUTE_RETURN_TYPE, returnType)
+    if (classFqName != null) {
+        properties.setProperty(FileTemplate.ATTRIBUTE_CLASS_NAME, classFqName.asString())
+        properties.setProperty(FileTemplate.ATTRIBUTE_SIMPLE_CLASS_NAME, classFqName.shortName().asString())
+    }
+    if (name != null) {
+        properties.setProperty(ATTRIBUTE_FUNCTION_NAME, name)
+    }
+
+    return try {
+        fileTemplate!!.getText(properties)
+    }
+    catch (e: ProcessCanceledException) {
+        throw e
+    }
+    catch (e: Throwable) {
+        // TODO: This is dangerous.
+        // Is there any way to avoid catching all exceptions?
+        throw IncorrectOperationException("Failed to parse file template", e)
+    }
+}
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
index 581b95ea7eb..7a9ecf848d7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
@@ -165,9 +165,9 @@ abstract class KotlinGenerateTestSupportActionBase(
                 val functionDescriptor = functionInPlace.resolveToDescriptor() as FunctionDescriptor
                 val overriddenDescriptors = functionDescriptor.overriddenDescriptors
                 val bodyText = when (overriddenDescriptors.size) {
-                    0 -> generateUnsupportedOrSuperCall(functionDescriptor, BodyType.EMPTY)
-                    1 -> generateUnsupportedOrSuperCall(overriddenDescriptors.single(), BodyType.SUPER)
-                    else -> generateUnsupportedOrSuperCall(overriddenDescriptors.first(), BodyType.QUALIFIED_SUPER)
+                    0 -> generateUnsupportedOrSuperCall(project, functionDescriptor, BodyType.EMPTY)
+                    1 -> generateUnsupportedOrSuperCall(project, overriddenDescriptors.single(), BodyType.SUPER)
+                    else -> generateUnsupportedOrSuperCall(project, overriddenDescriptors.first(), BodyType.QUALIFIED_SUPER)
                 }
                 functionInPlace.bodyExpression?.delete()
                 functionInPlace.add(KtPsiFactory(project).createBlock(bodyText))
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index 5990f77545c..f7d9d33aca9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -21,20 +21,16 @@ import com.intellij.codeInsight.navigation.NavigationUtil
 import com.intellij.codeInsight.template.*
 import com.intellij.codeInsight.template.impl.TemplateImpl
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl
-import com.intellij.ide.fileTemplates.FileTemplate
-import com.intellij.ide.fileTemplates.FileTemplateManager
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.ScrollType
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
-import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.psi.*
 import com.intellij.psi.codeStyle.CodeStyleManager
 import com.intellij.psi.codeStyle.JavaCodeStyleManager
 import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.util.IncorrectOperationException
 import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor
 import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode
 import org.jetbrains.kotlin.cfg.pseudocode.getContainingPseudocode
@@ -46,10 +42,8 @@ import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
 import org.jetbrains.kotlin.idea.caches.resolve.getJavaClassDescriptor
 import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
-import org.jetbrains.kotlin.idea.core.CollectingNameValidator
-import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
-import org.jetbrains.kotlin.idea.core.ShortenReferences
-import org.jetbrains.kotlin.idea.core.insertMember
+import org.jetbrains.kotlin.idea.core.*
+import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.ClassKind
 import org.jetbrains.kotlin.idea.refactoring.*
 import org.jetbrains.kotlin.idea.util.DialogWithEditor
@@ -66,7 +60,6 @@ import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.psi.typeRefHelpers.setReceiverTypeReference
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
-import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassOrAny
 import org.jetbrains.kotlin.resolve.scopes.HierarchicalScope
 import org.jetbrains.kotlin.resolve.scopes.LexicalScopeImpl
@@ -83,10 +76,6 @@ import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
 import java.util.*
 import kotlin.properties.Delegates
 
-private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt"
-private val TEMPLATE_FROM_USAGE_SECONDARY_CONSTRUCTOR_BODY = "New Kotlin Secondary Constructor Body.kt"
-private val ATTRIBUTE_FUNCTION_NAME = "FUNCTION_NAME"
-
 /**
  * Represents a single choice for a type (e.g. parameter type or return type).
  */
@@ -691,35 +680,18 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
 
         private fun setupFunctionBody(func: KtFunction) {
             val oldBody = func.bodyExpression ?: return
-
-            val templateName = when (func) {
-                is KtSecondaryConstructor -> TEMPLATE_FROM_USAGE_SECONDARY_CONSTRUCTOR_BODY
-                is KtNamedFunction -> TEMPLATE_FROM_USAGE_FUNCTION_BODY
+            val templateKind = when (func) {
+                is KtSecondaryConstructor -> TemplateKind.SECONDARY_CONSTRUCTOR
+                is KtNamedFunction -> TemplateKind.FUNCTION
                 else -> throw AssertionError("Unexpected declaration: " + func.getElementTextWithContext())
             }
-            val fileTemplate = FileTemplateManager.getInstance(func.project)!!.getCodeTemplate(templateName)
-            val properties = Properties()
-            properties.setProperty(FileTemplate.ATTRIBUTE_RETURN_TYPE, if (skipReturnType) "Unit" else func.typeReference!!.text)
-            receiverClassDescriptor?.let {
-                properties.setProperty(FileTemplate.ATTRIBUTE_CLASS_NAME, DescriptorUtils.getFqName(it).asString())
-                properties.setProperty(FileTemplate.ATTRIBUTE_SIMPLE_CLASS_NAME, it.name.asString())
-            }
-            if (callableInfo.name.isNotEmpty()) {
-                properties.setProperty(ATTRIBUTE_FUNCTION_NAME, callableInfo.name)
-            }
-
-            val bodyText = try {
-                fileTemplate!!.getText(properties)
-            }
-            catch (e: ProcessCanceledException) {
-                throw e
-            }
-            catch (e: Exception) {
-                // TODO: This is dangerous.
-                // Is there any way to avoid catching all exceptions?
-                throw IncorrectOperationException("Failed to parse file template", e)
-            }
-
+            val bodyText = getFunctionBodyTextFromTemplate(
+                    func.project,
+                    templateKind,
+                    if (callableInfo.name.isNotEmpty()) callableInfo.name else null,
+                    if (skipReturnType) "Unit" else func.typeReference!!.text,
+                    receiverClassDescriptor?.importableFqName ?: receiverClassDescriptor?.name?.let { FqName.topLevel(it) }
+            )
             oldBody.replace(KtPsiFactory(func).createBlock(bodyText))
         }
 
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
index c3494692a51..9e98c39f744 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
@@ -5,6 +5,6 @@ import org.junit.runners.Parameterized
 class A {
     @Parameterized.Parameters
     fun data(): Collection<Array<Any>> {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
index 04288c9f0db..60535967ca5 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
@@ -5,6 +5,6 @@ import org.junit.Before
 class A {
     @Before
     fun setUp() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt.after
index 931c803d3f4..ff4c414f1da 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt.after
@@ -5,7 +5,7 @@ import org.junit.Before
 class A {
     @org.testng.annotations.BeforeMethod
     fun setUp() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     @Before
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
index 346de8ab39d..2dac3329f77 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
@@ -5,6 +5,6 @@ import org.junit.After
 class A {
     @After
     fun tearDown() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt.after
index 3f827fdc79f..4580ba1ffa7 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt.after
@@ -5,7 +5,7 @@ import org.junit.After
 class A {
     @org.testng.annotations.AfterMethod
     fun tearDown() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     @After
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
index 6027c72e905..a5ba54d6a35 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
@@ -5,6 +5,6 @@ import org.junit.Test
 class A {
     @Test
     fun name() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after
index e076c9ab16c..e4a3ec40d2a 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after
@@ -4,6 +4,6 @@ import junit.framework.TestCase
 
 class A : TestCase() {
     fun testName() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
index e9b32057d09..c6065bae128 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
@@ -6,6 +6,6 @@ import org.testng.annotations.Test
 @Test class A {
     @DataProvider(name = "name")
     fun name(): Array<Array<Any>> {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
index c1a8a04968b..2b1160f5dfe 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
@@ -6,6 +6,6 @@ import org.testng.annotations.Test
 @Test class A {
     @BeforeMethod
     fun setUp() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
index 7ef8bc78e3c..2ed9609fd48 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
@@ -6,6 +6,6 @@ import org.testng.annotations.Test
 @Test class A {
     @AfterMethod
     fun tearDown() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
index 91ff040c4a9..62e5819e386 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
@@ -5,6 +5,6 @@ import org.testng.annotations.Test
 @Test class A {
     @Test
     fun testName() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/defaultValues.kt.after b/idea/testData/codeInsight/overrideImplement/defaultValues.kt.after
index 4daa86d7020..ab32064e6b5 100644
--- a/idea/testData/codeInsight/overrideImplement/defaultValues.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/defaultValues.kt.after
@@ -4,6 +4,6 @@ interface T {
 
 class C : T {
     override fun foo(a: Int) {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after b/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
index bcad0d8fb1a..cda099f81c0 100644
--- a/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
@@ -5,7 +5,7 @@ interface T {
 
 class C(t :T) : T by t {
     override fun bar() {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
     override fun equals(other: Any?): Boolean {
@@ -13,7 +13,7 @@ class C(t :T) : T by t {
     }
 
     override fun foo() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun hashCode(): Int {
diff --git a/idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after b/idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
index 286a0986de8..74f935b4b1e 100644
--- a/idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
@@ -23,7 +23,7 @@ class C : B(), I {
     }
 
     override fun g() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun hashCode(): Int {
diff --git a/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after b/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
index 25c5a63b1f7..ccd6336f5fa 100644
--- a/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
@@ -5,6 +5,6 @@ interface T {
 
 class C : T {
     override fun Foo(): (String) -> Unit {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after b/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after
index 25c5a63b1f7..ccd6336f5fa 100644
--- a/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after
@@ -5,6 +5,6 @@ interface T {
 
 class C : T {
     override fun Foo(): (String) -> Unit {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after b/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
index 4e5c38f1d55..e0f2e1cce39 100644
--- a/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
@@ -4,6 +4,6 @@ interface Trait {
 
 class TraitImpl : Trait {
     override fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B> {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
index 7f1ef6fa6a0..3be9ff771df 100644
--- a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
@@ -8,14 +8,14 @@ interface Some<T> {
 
 class SomeOther<S> : Some<S> {
     override fun someFoo() {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
     override fun someGenericFoo(): S {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun someOtherFoo(): Int {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
index c06b8ab2899..3173a01cbd9 100644
--- a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
@@ -4,6 +4,6 @@ interface G<T> {
 
 class GC() : G<Int> {
     override fun foo(t: Int): Int {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after b/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
index ca6e2a55cb8..58aa8eb3e07 100644
--- a/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
@@ -2,6 +2,6 @@
 
 class MyClass<A: Comparable<A>> : Iterable<A> {
     override fun iterator(): Iterator<A> {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/implementFunctionType.kt.after b/idea/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
index 06ac13a15a7..8c4c6f88a8e 100644
--- a/idea/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
@@ -1,5 +1,5 @@
 class C : (String) -> Boolean {
     override fun invoke(p1: String): Boolean {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
-}
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
index 85dc686f676..8bd8ff37b9a 100644
--- a/idea/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
@@ -3,6 +3,6 @@ import foo.B
 
 class C : A() {
     override fun foo(x: MutableList<Any?>?, y: String?): B<*>? {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
index 4ccad3ed591..30bf03f0c6b 100644
--- a/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
@@ -2,6 +2,6 @@ package foo
 
 class Impl: B {
     override fun foo(r: Runnable?) {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
index 407807ab486..5c086eeaf7d 100644
--- a/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
@@ -2,6 +2,6 @@ import foo.Intf
 
 class Impl(): Intf {
     override fun getFooBar(): String? {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
index 8da281bcf31..c1d693e8494 100644
--- a/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
@@ -2,6 +2,6 @@ import foo.Intf
 
 class Impl(): Intf {
     override fun fooBar(i: Int, s: Array<out String>?, foo: Any?) {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/localClass.kt.after b/idea/testData/codeInsight/overrideImplement/localClass.kt.after
index 0e1e4ced4ae..bf5784c95af 100644
--- a/idea/testData/codeInsight/overrideImplement/localClass.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/localClass.kt.after
@@ -7,7 +7,7 @@ fun f() {
 
     object : C<R>() {
         override fun f(a: R) {
-            <selection><caret>throw UnsupportedOperationException()</selection>
+            <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
         }
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after b/idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after
index f0dc6541c1e..a9fef6855e7 100644
--- a/idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after
@@ -8,7 +8,7 @@ interface B {
 
 class C : A(), B {
     override fun bar() {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
     override fun equals(other: Any?): Boolean {
diff --git a/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
index 569e451c7e2..a9a29877bd4 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
@@ -4,6 +4,6 @@ interface A {
 
 class B : A {
     override fun String.foo() {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
index 7ba1f2d7b09..4f85ea76bdf 100644
--- a/idea/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
@@ -20,6 +20,6 @@ class C : A(), I {
     }
 
     override fun z() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
index 47e356d38f7..8819a883a49 100644
--- a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
@@ -6,7 +6,7 @@ interface Test {
 class SomeTest : Test {
     val hello = 12
     override fun test() {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
     override val testProp: Int
diff --git a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
index a66e44f7fcd..cd7fde4e142 100644
--- a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
@@ -3,7 +3,7 @@ import lib.ArrayFactory
 
 public class Impl : ArrayFactory {
     override fun create(): lib.Array {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
 
diff --git a/idea/testData/codeInsight/overrideImplement/starProjections.kt.after b/idea/testData/codeInsight/overrideImplement/starProjections.kt.after
index 9033070807b..d37578c4cb4 100644
--- a/idea/testData/codeInsight/overrideImplement/starProjections.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/starProjections.kt.after
@@ -6,6 +6,6 @@ interface Base {
 
 class Derived : Base {
     override fun foo(c: C<*>) {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
-}
+}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/superPreference.kt.after b/idea/testData/codeInsight/overrideImplement/superPreference.kt.after
index a5eb409eb05..bf88498eefd 100644
--- a/idea/testData/codeInsight/overrideImplement/superPreference.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/superPreference.kt.after
@@ -30,15 +30,15 @@ abstract class B : I2, A(), I3 {
     }
 
     override fun i() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun i1() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun i2() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun toString(): String {
diff --git a/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after b/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
index f61791b5d75..f869a89549a 100644
--- a/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
@@ -4,6 +4,6 @@ interface G<T> {
 
 class GC<T>() : G<T> {
     override fun foo(t: T): T {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after b/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
index 568c9e50dd0..6e9a8733613 100644
--- a/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
@@ -4,6 +4,6 @@ interface Some {
 
 class SomeOther : Some {
     override fun foo(some: Int?): Int {
-        <selection><caret>throw UnsupportedOperationException()</selection>
+        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumClass.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumClass.kt.after
index 82023d3745f..2010fe132e8 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumClass.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumClass.kt.after
@@ -8,6 +8,6 @@ enum class E : T<Int> {
     A, B, C;
 
     override fun foo(x: Int): Int {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after
index 82023d3745f..2010fe132e8 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after
@@ -8,6 +8,6 @@ enum class E : T<Int> {
     A, B, C;
 
     override fun foo(x: Int): Int {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after
index 024114e7827..e26767eaf9e 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after
@@ -8,7 +8,7 @@ enum class E : T<Int> {
     A, B, C;
 
     override fun foo(x: Int): Int {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     val bar = 1
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumEntries.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumEntries.kt.after
index 81b1f4754d9..56f8ec4e634 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumEntries.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumEntries.kt.after
@@ -3,15 +3,15 @@
 enum class E {
     A {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }, B {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }, C {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     };
 
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after
index 1555a2e96dd..e92ca79a0cc 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after
@@ -3,15 +3,15 @@
 enum class E(n: Int) {
     A(1) {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }, B(2) {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }, C(3) {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     };
 
diff --git a/idea/testData/intentions/implementAbstractMember/function/implementAll.kt.after b/idea/testData/intentions/implementAbstractMember/function/implementAll.kt.after
index 0866782b48e..35b607a7055 100644
--- a/idea/testData/intentions/implementAbstractMember/function/implementAll.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/implementAll.kt.after
@@ -6,14 +6,14 @@ interface T<X> {
 
 class U : T<String> {
     override fun foo(x: String): String {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
 
 class V : T<Int> {
     override fun foo(x: Int): Int {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
diff --git a/idea/testData/quickfix/implement/abstract.kt.after b/idea/testData/quickfix/implement/abstract.kt.after
index a8c30fbbf41..03606d53162 100644
--- a/idea/testData/quickfix/implement/abstract.kt.after
+++ b/idea/testData/quickfix/implement/abstract.kt.after
@@ -14,6 +14,6 @@ private class BaseImpl : Base() {
         }
 
     override fun toInt(arg: String): Int {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/implement/inner.kt.after b/idea/testData/quickfix/implement/inner.kt.after
index 35411d48bed..e2459dbd4db 100644
--- a/idea/testData/quickfix/implement/inner.kt.after
+++ b/idea/testData/quickfix/implement/inner.kt.after
@@ -8,7 +8,7 @@ class Container {
 
     inner class BaseImpl : Base() {
         override fun foo(): String {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }
 }
diff --git a/idea/testData/quickfix/implement/interface.kt.after b/idea/testData/quickfix/implement/interface.kt.after
index 692dc5d8bd8..a80d329c9ba 100644
--- a/idea/testData/quickfix/implement/interface.kt.after
+++ b/idea/testData/quickfix/implement/interface.kt.after
@@ -9,6 +9,6 @@ interface Base {
 
 class BaseImpl : Base {
     override fun foo(x: Int): Int {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/implement/nested.kt.after b/idea/testData/quickfix/implement/nested.kt.after
index f3cd6daf292..49b2a5510c5 100644
--- a/idea/testData/quickfix/implement/nested.kt.after
+++ b/idea/testData/quickfix/implement/nested.kt.after
@@ -19,7 +19,7 @@ class BaseImpl : Container.Base {
         get() = throw UnsupportedOperationException()
 
     override fun bar(z: Int): String {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/implement/sealed.kt.after b/idea/testData/quickfix/implement/sealed.kt.after
index 371ef5e66bf..54f15a196c0 100644
--- a/idea/testData/quickfix/implement/sealed.kt.after
+++ b/idea/testData/quickfix/implement/sealed.kt.after
@@ -5,7 +5,7 @@ sealed class Base {
     abstract fun foo(): Int
     class BaseImpl : Base() {
         override fun foo(): Int {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/implement/sealedWithConflict.kt.after b/idea/testData/quickfix/implement/sealedWithConflict.kt.after
index b069f6d9164..670ef68551d 100644
--- a/idea/testData/quickfix/implement/sealedWithConflict.kt.after
+++ b/idea/testData/quickfix/implement/sealedWithConflict.kt.after
@@ -10,7 +10,7 @@ sealed class Base {
 
     class BaseImpl1 : Base() {
         override fun foo(): Int {
-            throw UnsupportedOperationException()
+            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/implementMember.kt.after b/idea/testData/quickfix/override/implementMember.kt.after
index 63aedb94579..fdf027fdfc1 100644
--- a/idea/testData/quickfix/override/implementMember.kt.after
+++ b/idea/testData/quickfix/override/implementMember.kt.after
@@ -5,6 +5,6 @@ interface I {
 
 class A : I {
     override fun foo() {
-        <caret><selection>throw UnsupportedOperationException()</selection>
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt.after b/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
index 1f1014a99a4..6c41c615b1c 100644
--- a/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
+++ b/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
@@ -5,6 +5,6 @@ abstract class A {
 
 class B : A() {
     override fun foo() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after b/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after
index 027d0383a89..839798a4e8f 100644
--- a/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after
+++ b/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after
@@ -14,6 +14,6 @@ interface A {
 }
 class B : A {
     override fun gav() {
-        throw UnsupportedOperationException()
+        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file