diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtSecondaryConstructor.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtSecondaryConstructor.kt
index 10104004521..02e9d051da9 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtSecondaryConstructor.kt
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtSecondaryConstructor.kt
@@ -35,6 +35,8 @@ class KtSecondaryConstructor : KtConstructor<KtSecondaryConstructor> {
 
     fun getDelegationCall(): KtConstructorDelegationCall = findNotNullChildByClass(KtConstructorDelegationCall::class.java)
 
+    fun getDelegationCallOrNull(): KtConstructorDelegationCall? = findChildByClass(KtConstructorDelegationCall::class.java)
+
     fun hasImplicitDelegationCall(): Boolean = getDelegationCall().isImplicit
 
     fun replaceImplicitDelegationCallWithExplicit(isThis: Boolean): KtConstructorDelegationCall {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java
index 2c882ade545..fd23d66fd9d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java
@@ -28,6 +28,11 @@ public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModif
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/outOfBlock"), Pattern.compile("^(.+)\\.(kt|kts)$"), true);
     }
 
+    @TestMetadata("Comment.kt")
+    public void testComment() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/Comment.kt");
+    }
+
     @TestMetadata("FunBlock.kt")
     public void testFunBlock() throws Exception {
         runTest("idea/testData/codeInsight/outOfBlock/FunBlock.kt");
@@ -93,6 +98,21 @@ public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModif
         runTest("idea/testData/codeInsight/outOfBlock/InClassPropertyAccessor.kt");
     }
 
+    @TestMetadata("InComment.kt")
+    public void testInComment() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/InComment.kt");
+    }
+
+    @TestMetadata("InDelegateCallOfSecondaryConstructor.kt")
+    public void testInDelegateCallOfSecondaryConstructor() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/InDelegateCallOfSecondaryConstructor.kt");
+    }
+
+    @TestMetadata("InDelegateCallOfSecondaryConstructorInLocalClass.kt")
+    public void testInDelegateCallOfSecondaryConstructorInLocalClass() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/InDelegateCallOfSecondaryConstructorInLocalClass.kt");
+    }
+
     @TestMetadata("InExtensionFunction.kt")
     public void testInExtensionFunction() throws Exception {
         runTest("idea/testData/codeInsight/outOfBlock/InExtensionFunction.kt");
@@ -143,6 +163,11 @@ public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModif
         runTest("idea/testData/codeInsight/outOfBlock/InGlobalPropertyWithGetter.kt");
     }
 
+    @TestMetadata("InKDocComment.kt")
+    public void testInKDocComment() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/InKDocComment.kt");
+    }
+
     @TestMetadata("InLambdaFunction.kt")
     public void testInLambdaFunction() throws Exception {
         runTest("idea/testData/codeInsight/outOfBlock/InLambdaFunction.kt");
@@ -168,6 +193,11 @@ public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModif
         runTest("idea/testData/codeInsight/outOfBlock/InNestedClassFunNoTypeBlockExpression.kt");
     }
 
+    @TestMetadata("InPrimaryConstructor.kt")
+    public void testInPrimaryConstructor() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/InPrimaryConstructor.kt");
+    }
+
     @TestMetadata("InPropertyAccessorSpecifyType.kt")
     public void testInPropertyAccessorSpecifyType() throws Exception {
         runTest("idea/testData/codeInsight/outOfBlock/InPropertyAccessorSpecifyType.kt");
@@ -203,6 +233,21 @@ public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModif
         runTest("idea/testData/codeInsight/outOfBlock/InPropertyWithInference.kt");
     }
 
+    @TestMetadata("InPropertyWithoutInference.kt")
+    public void testInPropertyWithoutInference() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/InPropertyWithoutInference.kt");
+    }
+
+    @TestMetadata("InSecondaryConstructorBody.kt")
+    public void testInSecondaryConstructorBody() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/InSecondaryConstructorBody.kt");
+    }
+
+    @TestMetadata("InSecondaryConstructorParameter.kt")
+    public void testInSecondaryConstructorParameter() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/InSecondaryConstructorParameter.kt");
+    }
+
     @TestMetadata("InSuperTypeCallCallInLambdaInCall.kt")
     public void testInSuperTypeCallCallInLambdaInCall() throws Exception {
         runTest("idea/testData/codeInsight/outOfBlock/InSuperTypeCallCallInLambdaInCall.kt");
@@ -233,6 +278,11 @@ public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModif
         runTest("idea/testData/codeInsight/outOfBlock/InitBlock.kt");
     }
 
+    @TestMetadata("InitBlockInLocalClass.kt")
+    public void testInitBlockInLocalClass() throws Exception {
+        runTest("idea/testData/codeInsight/outOfBlock/InitBlockInLocalClass.kt");
+    }
+
     @TestMetadata("LocalFunWithBody.kt")
     public void testLocalFunWithBody() throws Exception {
         runTest("idea/testData/codeInsight/outOfBlock/LocalFunWithBody.kt");