diff --git a/plugins/coverage/intellij.java.coverage.iml b/plugins/coverage/intellij.java.coverage.iml
index 495669f3bf20..5c1566c368ed 100644
--- a/plugins/coverage/intellij.java.coverage.iml
+++ b/plugins/coverage/intellij.java.coverage.iml
@@ -11,49 +11,49 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="JaCoCo" type="repository">
-        <properties maven-id="org.jacoco:org.jacoco.ant:0.8.12">
+        <properties maven-id="org.jacoco:org.jacoco.ant:0.8.13">
           <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.ant/0.8.12/org.jacoco.ant-0.8.12.jar">
-              <sha256sum>43f81e03dd6f5190aecb88a6236b694adade484b0402447c320fc6e94d685f41</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.ant/0.8.13/org.jacoco.ant-0.8.13.jar">
+              <sha256sum>6434b8552ff3d0e4a2fbbd13a6efb124e0c9ca453817c62c03de8390d87ffd11</sha256sum>
             </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.core/0.8.12/org.jacoco.core-0.8.12.jar">
-              <sha256sum>fca26db37c0c5fbd5dc4985237eb82866df9799d5082af899475a73f91f5b035</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.core/0.8.13/org.jacoco.core-0.8.13.jar">
+              <sha256sum>514c23df6cfd015d7d83c10a792e35ab68a7b7e82f3d6a3a4481762c132e33a9</sha256sum>
             </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.7/asm-9.7.jar">
-              <sha256sum>adf46d5e34940bdf148ecdd26a9ee8eea94496a72034ff7141066b3eea5c4e9d</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.8/asm-9.8.jar">
+              <sha256sum>876eab6a83daecad5ca67eb9fcabb063c97b5aeb8cf1fca7a989ecde17522051</sha256sum>
             </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/9.7/asm-commons-9.7.jar">
-              <sha256sum>389bc247958e049fc9a0408d398c92c6d370c18035120395d4cba1d9d9304b7a</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/9.8/asm-commons-9.8.jar">
+              <sha256sum>3301a1c1cb4c59fcc5292648dac1d7c5aed4c0f067dfbe88873b8cdfe77404f4</sha256sum>
             </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/9.7/asm-tree-9.7.jar">
-              <sha256sum>62f4b3bc436045c1acb5c3ba2d8ec556ec3369093d7f5d06c747eb04b56d52b1</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/9.8/asm-tree-9.8.jar">
+              <sha256sum>14b7880cb7c85eed101e2710432fc3ffb83275532a6a894dc4c4095d49ad59f1</sha256sum>
             </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.report/0.8.12/org.jacoco.report-0.8.12.jar">
-              <sha256sum>f9c79ad66a66a0337c57849ad1287a2ab23b9b232d35314443e5ec49e6e3d20f</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.report/0.8.13/org.jacoco.report-0.8.13.jar">
+              <sha256sum>8133280a0aa44358be9d136b52370342f455ccb944aae07438220a77662578a2</sha256sum>
             </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12.jar">
-              <sha256sum>ab29507b750d325bbaf7ea094860fff26d27170038d8ee5f00c3074489f14637</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.13/org.jacoco.agent-0.8.13.jar">
+              <sha256sum>9db3c9d5d74fa870b261b64a3082412e1bd6e22e9fa98f4737b1bff8af9cc64d</sha256sum>
             </artifact>
           </verification>
         </properties>
         <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.ant/0.8.12/org.jacoco.ant-0.8.12.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.core/0.8.12/org.jacoco.core-0.8.12.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.7/asm-9.7.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/9.7/asm-commons-9.7.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/9.7/asm-tree-9.7.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.report/0.8.12/org.jacoco.report-0.8.12.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.ant/0.8.13/org.jacoco.ant-0.8.13.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.core/0.8.13/org.jacoco.core-0.8.13.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.8/asm-9.8.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/9.8/asm-commons-9.8.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/9.8/asm-tree-9.8.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.report/0.8.13/org.jacoco.report-0.8.13.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.13/org.jacoco.agent-0.8.13.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.ant/0.8.12/org.jacoco.ant-0.8.12-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.core/0.8.12/org.jacoco.core-0.8.12-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.7/asm-9.7-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/9.7/asm-commons-9.7-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/9.7/asm-tree-9.7-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.report/0.8.12/org.jacoco.report-0.8.12-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.ant/0.8.13/org.jacoco.ant-0.8.13-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.core/0.8.13/org.jacoco.core-0.8.13-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.8/asm-9.8-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/9.8/asm-commons-9.8-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/9.8/asm-tree-9.8-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.report/0.8.13/org.jacoco.report-0.8.13-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.13/org.jacoco.agent-0.8.13-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/plugins/coverage/testData/conditions/conditions$All_in_conditions.exec b/plugins/coverage/testData/conditions/conditions$All_in_conditions.exec
index 78cd2382c127..c8fae6720e96 100644
Binary files a/plugins/coverage/testData/conditions/conditions$All_in_conditions.exec and b/plugins/coverage/testData/conditions/conditions$All_in_conditions.exec differ
diff --git a/plugins/coverage/testData/conditions/out/production/conditions/KtAllConditions.class b/plugins/coverage/testData/conditions/out/production/conditions/KtAllConditions.class
index 6d61bfb00d18..ed9e236bef7b 100644
Binary files a/plugins/coverage/testData/conditions/out/production/conditions/KtAllConditions.class and b/plugins/coverage/testData/conditions/out/production/conditions/KtAllConditions.class differ
diff --git a/plugins/coverage/testData/conditions/out/production/conditions/KtCommentsAndParentheses.class b/plugins/coverage/testData/conditions/out/production/conditions/KtCommentsAndParentheses.class
index 207360ca0886..17e2114d02fb 100644
Binary files a/plugins/coverage/testData/conditions/out/production/conditions/KtCommentsAndParentheses.class and b/plugins/coverage/testData/conditions/out/production/conditions/KtCommentsAndParentheses.class differ
diff --git a/plugins/coverage/testData/conditions/out/production/conditions/KtConditions.class b/plugins/coverage/testData/conditions/out/production/conditions/KtConditions.class
index 2f0b7894d335..f031907f8ffe 100644
Binary files a/plugins/coverage/testData/conditions/out/production/conditions/KtConditions.class and b/plugins/coverage/testData/conditions/out/production/conditions/KtConditions.class differ
diff --git a/plugins/coverage/testData/conditions/out/production/conditions/KtLineBreaks.class b/plugins/coverage/testData/conditions/out/production/conditions/KtLineBreaks.class
index b00c942b3706..e070d53b6b76 100644
Binary files a/plugins/coverage/testData/conditions/out/production/conditions/KtLineBreaks.class and b/plugins/coverage/testData/conditions/out/production/conditions/KtLineBreaks.class differ
diff --git a/plugins/coverage/testData/conditions/out/production/conditions/KtNullability.class b/plugins/coverage/testData/conditions/out/production/conditions/KtNullability.class
index 45fc8bfc7326..48f8f5173148 100644
Binary files a/plugins/coverage/testData/conditions/out/production/conditions/KtNullability.class and b/plugins/coverage/testData/conditions/out/production/conditions/KtNullability.class differ
diff --git a/plugins/coverage/testData/conditions/out/production/conditions/KtSwitches.class b/plugins/coverage/testData/conditions/out/production/conditions/KtSwitches.class
index 81de8ade642b..b386164c66f0 100644
Binary files a/plugins/coverage/testData/conditions/out/production/conditions/KtSwitches.class and b/plugins/coverage/testData/conditions/out/production/conditions/KtSwitches.class differ
diff --git a/plugins/coverage/testData/conditions/out/production/conditions/META-INF/conditions.kotlin_module b/plugins/coverage/testData/conditions/out/production/conditions/META-INF/conditions.kotlin_module
index 1e9f2ca4d180..9dbc290d21e8 100644
Binary files a/plugins/coverage/testData/conditions/out/production/conditions/META-INF/conditions.kotlin_module and b/plugins/coverage/testData/conditions/out/production/conditions/META-INF/conditions.kotlin_module differ
diff --git a/plugins/coverage/testData/conditions/out/test/conditions/KtNullabilityTest.class b/plugins/coverage/testData/conditions/out/test/conditions/KtNullabilityTest.class
index 9d540a1c065c..80e4cf9bfa71 100644
Binary files a/plugins/coverage/testData/conditions/out/test/conditions/KtNullabilityTest.class and b/plugins/coverage/testData/conditions/out/test/conditions/KtNullabilityTest.class differ
diff --git a/plugins/coverage/testData/conditions/out/test/conditions/META-INF/conditions.kotlin_module b/plugins/coverage/testData/conditions/out/test/conditions/META-INF/conditions.kotlin_module
index 1e9f2ca4d180..9dbc290d21e8 100644
Binary files a/plugins/coverage/testData/conditions/out/test/conditions/META-INF/conditions.kotlin_module and b/plugins/coverage/testData/conditions/out/test/conditions/META-INF/conditions.kotlin_module differ
diff --git a/plugins/coverage/testData/conditions/outputs/jacoco/KtLineBreaks.txt b/plugins/coverage/testData/conditions/outputs/jacoco/KtLineBreaks.txt
index b293bf7e1fe2..25e85bbbe8b4 100644
--- a/plugins/coverage/testData/conditions/outputs/jacoco/KtLineBreaks.txt
+++ b/plugins/coverage/testData/conditions/outputs/jacoco/KtLineBreaks.txt
@@ -7,11 +7,11 @@ Line 4 coverage: FULL
 Hits: 1
 Line 8 coverage: FULL
 Hits: 1
-Line 13 coverage: FULL
-Hits: 1
-Line 15 coverage: PARTIAL
+Line 13 coverage: PARTIAL
 Hits: 1
 Covered 1/2 branches
+Line 15 coverage: FULL
+Hits: 1
 Line 17 coverage: FULL
 Hits: 1
 Line 18 coverage: FULL
@@ -58,40 +58,40 @@ Covered 1/2 branches
 Line 43 coverage: PARTIAL
 Hits: 1
 Covered 1/2 branches
-Line 47 coverage: FULL
+Line 47 coverage: PARTIAL
 Hits: 1
+Covered 1/2 branches
 Line 49 coverage: PARTIAL
 Hits: 1
-Line 51 coverage: PARTIAL
+Line 51 coverage: FULL
 Hits: 1
-Covered 1/2 branches
 Line 55 coverage: FULL
 Hits: 1
-Line 58 coverage: FULL
-Hits: 1
-Line 60 coverage: PARTIAL
+Line 58 coverage: PARTIAL
 Hits: 1
 Covered 1/2 branches
+Line 60 coverage: PARTIAL
+Hits: 1
 Line 64 coverage: FULL
 Hits: 1
 Line 67 coverage: FULL
 Hits: 1
-Line 69 coverage: FULL
-Hits: 1
-Line 71 coverage: PARTIAL
+Line 69 coverage: PARTIAL
 Hits: 1
 Covered 1/2 branches
+Line 71 coverage: FULL
+Hits: 1
 Line 76 coverage: FULL
 Hits: 1
 Line 79 coverage: FULL
 Hits: 1
 Line 81 coverage: FULL
 Hits: 1
-Line 84 coverage: FULL
-Hits: 1
-Line 86 coverage: PARTIAL
+Line 84 coverage: PARTIAL
 Hits: 1
 Covered 1/2 branches
+Line 86 coverage: FULL
+Hits: 1
 Line 88 coverage: FULL
 Hits: 1
 Line 90 coverage: FULL
diff --git a/plugins/coverage/testData/conditions/outputs/jacoco/KtSwitches.txt b/plugins/coverage/testData/conditions/outputs/jacoco/KtSwitches.txt
index 4a09e3bb192c..d21942befcd2 100644
--- a/plugins/coverage/testData/conditions/outputs/jacoco/KtSwitches.txt
+++ b/plugins/coverage/testData/conditions/outputs/jacoco/KtSwitches.txt
@@ -63,7 +63,7 @@ Line 53 coverage: FULL
 Hits: 1
 Line 56 coverage: PARTIAL
 Hits: 1
-Covered 3/10 branches
+Covered 2/8 branches
 Line 59 coverage: FULL
 Hits: 1
 Line 65 coverage: FULL
@@ -75,9 +75,9 @@ Hits: 1
 Covered 1/2 branches
 Line 72 coverage: FULL
 Hits: 1
-Line 75 coverage: PARTIAL
+Line 75 coverage: FULL
 Hits: 1
-Covered 5/6 branches
+Covered 4/4 branches
 Line 76 coverage: FULL
 Hits: 1
 Line 77 coverage: FULL
@@ -88,9 +88,9 @@ Line 79 coverage: FULL
 Hits: 1
 Line 81 coverage: FULL
 Hits: 1
-Line 84 coverage: PARTIAL
+Line 84 coverage: FULL
 Hits: 1
-Covered 6/7 branches
+Covered 5/5 branches
 Line 85 coverage: FULL
 Hits: 1
 Line 86 coverage: FULL