diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index 272c0dd4140..556e7584f5a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -706,7 +706,7 @@ public interface Errors {
     DiagnosticFactory0<KtWhenEntry> ELSE_MISPLACED_IN_WHEN = DiagnosticFactory0.create(ERROR, ELSE_ENTRY);
     DiagnosticFactory0<KtWhenExpression> NO_ELSE_IN_WHEN = DiagnosticFactory0.create(ERROR, WHEN_EXPRESSION);
     DiagnosticFactory0<KtWhenExpression> NON_EXHAUSTIVE_WHEN = DiagnosticFactory0.create(WARNING, WHEN_EXPRESSION);
-    DiagnosticFactory0<PsiElement> COMMA_IN_WHEN_CONDITION_WITHOUT_ARGUMENT = DiagnosticFactory0.create(WARNING);
+    DiagnosticFactory0<PsiElement> COMMA_IN_WHEN_CONDITION_WITHOUT_ARGUMENT = DiagnosticFactory0.create(ERROR);
 
     // Type mismatch
 
diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt
index b0f2d2975d7..19e82de9edb 100644
--- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt
+++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt
@@ -31,7 +31,7 @@ public abstract class ReflectJavaType : JavaType {
         fun create(type: Type): ReflectJavaType {
             return when {
                 type is Class<*> && type.isPrimitive() -> ReflectJavaPrimitiveType(type)
-                type is GenericArrayType, type is Class<*> && type.isArray() -> ReflectJavaArrayType(type)
+                type is GenericArrayType || type is Class<*> && type.isArray() -> ReflectJavaArrayType(type)
                 type is WildcardType -> ReflectJavaWildcardType(type)
                 else -> ReflectJavaClassifierType(type)
             }
diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/reflectClassUtil.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/reflectClassUtil.kt
index c89e1930503..07a55461f31 100644
--- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/reflectClassUtil.kt
+++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/reflectClassUtil.kt
@@ -34,7 +34,7 @@ public val Class<*>.classId: ClassId
     get() = when {
         isPrimitive() -> throw IllegalArgumentException("Can't compute ClassId for primitive type: $this")
         isArray() -> throw IllegalArgumentException("Can't compute ClassId for array type: $this")
-        getEnclosingMethod() != null, getEnclosingConstructor() != null, getSimpleName().isEmpty() -> {
+        getEnclosingMethod() != null || getEnclosingConstructor() != null || getSimpleName().isEmpty() -> {
             val fqName = FqName(getName())
             ClassId(fqName.parent(), FqName.topLevel(fqName.shortName()), /* local = */ true)
         }
diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
index 87768733b0a..e49328ccbb5 100644
--- a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
@@ -387,7 +387,7 @@ class GenerateProtoBufCompare {
 
     private fun Printer.printlnIfWithComparison(field: Descriptors.FieldDescriptor, expr: String, statement: String = "return false") {
         val line = when {
-            field.options.getExtension(DebugExtOptionsProtoBuf.stringIdInTable),
+            field.options.getExtension(DebugExtOptionsProtoBuf.stringIdInTable) ||
             field.options.getExtension(DebugExtOptionsProtoBuf.nameIdInTable) ->
                 "if (!$CHECK_STRING_EQAULS_NAME(old.$expr, new.$expr)) $statement"
             field.options.getExtension(DebugExtOptionsProtoBuf.fqNameIdInTable) ->
@@ -408,7 +408,7 @@ class GenerateProtoBufCompare {
 
     private fun fieldToHashCode(field: Descriptors.FieldDescriptor, expr: String): String =
         when {
-            field.options.getExtension(DebugExtOptionsProtoBuf.stringIdInTable),
+            field.options.getExtension(DebugExtOptionsProtoBuf.stringIdInTable) ||
             field.options.getExtension(DebugExtOptionsProtoBuf.nameIdInTable) ->
                 "stringIndexes($expr)"
             field.options.getExtension(DebugExtOptionsProtoBuf.fqNameIdInTable) ->
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/UsageTypeUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/UsageTypeUtils.kt
index 468a79e5d1f..2f70dc10bce 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/UsageTypeUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/UsageTypeUtils.kt
@@ -170,8 +170,8 @@ public object UsageTypeUtils {
                 } ->
                     if (descriptor is ConstructorDescriptor) CLASS_NEW_OPERATOR else FUNCTION_CALL
 
-                refExpr.getParentOfTypeAndBranch<KtBinaryExpression>(){ getOperationReference() } != null,
-                refExpr.getParentOfTypeAndBranch<KtUnaryExpression>(){ getOperationReference() } != null,
+                refExpr.getParentOfTypeAndBranch<KtBinaryExpression>(){ getOperationReference() } != null ||
+                refExpr.getParentOfTypeAndBranch<KtUnaryExpression>(){ getOperationReference() } != null ||
                 refExpr.getParentOfTypeAndBranch<KtWhenConditionInRange>(){ getOperationReference() } != null ->
                     FUNCTION_CALL
 
@@ -195,7 +195,7 @@ public object UsageTypeUtils {
         return when (descriptor) {
             is ClassifierDescriptor -> when {
             // Treat object accesses as variables to simulate the old behaviour (when variables were created for objects)
-                DescriptorUtils.isNonCompanionObject(descriptor), DescriptorUtils.isEnumEntry(descriptor) -> getVariableUsageType()
+                DescriptorUtils.isNonCompanionObject(descriptor) || DescriptorUtils.isEnumEntry(descriptor) -> getVariableUsageType()
                 DescriptorUtils.isCompanionObject(descriptor) -> COMPANION_OBJECT_ACCESS
                 else -> getClassUsageType()
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
index 00f29f0df42..fb04c421114 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
@@ -83,7 +83,7 @@ public class KotlinFindClassUsagesHandler(
                                 public override fun execute(element: PsiClass): Boolean {
                                     val isInterface = element.isInterface()
                                     return when {
-                                        isInterface && options.isDerivedInterfaces, !isInterface && options.isDerivedClasses ->
+                                        isInterface && options.isDerivedInterfaces || !isInterface && options.isDerivedClasses ->
                                             KotlinFindUsagesHandler.processUsage(processor, element.getNavigationElement())
                                         else -> true
                                     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/JavaPsiUtils.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/JavaPsiUtils.kt
index e63958b1a5d..17d7e0ca465 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/JavaPsiUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/JavaPsiUtils.kt
@@ -56,7 +56,7 @@ internal fun getPsiMethod(element: PsiElement?): PsiMethod? {
     return when {
         element == null -> null
         element is PsiMethod -> element
-        parent is KtNamedFunction, parent is KtSecondaryConstructor -> LightClassUtil.getLightClassMethod(parent as KtFunction)
+        parent is KtNamedFunction || parent is KtSecondaryConstructor -> LightClassUtil.getLightClassMethod(parent as KtFunction)
         else -> null
     }
 }
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 1628d3790cf..44fe710962d 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
@@ -529,7 +529,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
 
                     val neighborType = neighbor?.getNode()?.getElementType()
                     val lineBreaksNeeded = when {
-                        neighborType == KtTokens.LBRACE, neighborType == KtTokens.RBRACE -> 1
+                        neighborType == KtTokens.LBRACE || neighborType == KtTokens.RBRACE -> 1
                         neighbor is KtDeclaration && (neighbor !is KtProperty || decl !is KtProperty) -> 2
                         else -> 1
                     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
index f277a737da7..646f2ffebb3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt
@@ -86,7 +86,7 @@ object CreateParameterByRefActionFactory : CreateParameterFromUsageFactory<KtSim
                     .firstOrNull()
                     ?.let {
                         when {
-                            (it is KtNamedFunction || it is KtSecondaryConstructor) && varExpected,
+                            (it is KtNamedFunction || it is KtSecondaryConstructor) && varExpected ||
                             it is KtPropertyAccessor -> chooseContainingClass(it)
                             it is KtAnonymousInitializer -> it.parent?.parent as? KtClass
                             it is KtSuperTypeListEntry -> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt
index d109f0a1428..eb985bfc71a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt
@@ -153,7 +153,7 @@ class KotlinFunctionCallUsage(
 
     private fun needSeparateVariable(element: PsiElement): Boolean {
         return when {
-            element is KtConstantExpression, element is KtThisExpression, element is KtSimpleNameExpression -> false
+            element is KtConstantExpression || element is KtThisExpression || element is KtSimpleNameExpression -> false
             element is KtBinaryExpression && OperatorConventions.ASSIGNMENT_OPERATIONS.contains(element.operationToken) -> true
             element is KtUnaryExpression && OperatorConventions.INCREMENT_OPERATIONS.contains(element.operationToken) -> true
             element is KtCallExpression -> element.getResolvedCall(context)?.resultingDescriptor is ConstructorDescriptor
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
index add064a561b..1779b2a4ac1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
@@ -333,7 +333,7 @@ val ControlFlow.possibleReturnTypes: List<KotlinType>
         return when {
             !returnType.isNullabilityFlexible() ->
                 listOf(returnType)
-            returnType.isAnnotatedNotNull(), returnType.isAnnotatedNullable() ->
+            returnType.isAnnotatedNotNull() || returnType.isAnnotatedNullable() ->
                 listOf(approximateFlexibleTypes(returnType))
             else ->
                 returnType.getCapability(javaClass<Flexibility>()).let { listOf(it!!.upperBound, it.lowerBound) }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/inferParameterInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/inferParameterInfo.kt
index 03e098dbd44..0cccc881265 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/inferParameterInfo.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/inferParameterInfo.kt
@@ -87,7 +87,7 @@ internal fun ExtractionData.inferParametersInfo(
         val resolvedCall = refInfo.resolveResult.resolvedCall
         val extensionReceiver = resolvedCall?.extensionReceiver
         val receiverToExtract = (when {
-            extensionReceiver == ReceiverValue.NO_RECEIVER,
+            extensionReceiver == ReceiverValue.NO_RECEIVER ||
             isSynthesizedInvoke(refInfo.resolveResult.descriptor) -> resolvedCall?.dispatchReceiver
             else -> extensionReceiver
         } as? ReceiverValue) ?: ReceiverValue.NO_RECEIVER
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
index 9cbf590b2e1..3e753fb5e0b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
@@ -368,7 +368,7 @@ object KotlinIntroduceVariableHandler : KotlinIntroduceHandlerBase() {
         for ((place, parent) in parentsWithSelf.zip(parents)) {
             when {
                 parent is KtContainerNode && place !is KtBlockExpression && !parent.isBadContainerNode(place) -> result = parent
-                parent is KtClassBody, parent is KtFile -> return result
+                parent is KtClassBody || parent is KtFile -> return result
                 parent is KtBlockExpression -> result = parent
                 parent is KtWhenEntry && place !is KtBlockExpression -> result = parent
                 parent is KtDeclarationWithBody && parent.bodyExpression == place && place !is KtBlockExpression -> result = parent
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
index 0d911475685..c9bcb9c0a89 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
@@ -436,8 +436,8 @@ public fun PsiElement.canRefactor(): Boolean {
     return when {
         this is PsiPackage ->
             getDirectories().any { it.canRefactor() }
-        this is KtElement,
-        this is PsiMember && getLanguage() == JavaLanguage.INSTANCE,
+        this is KtElement ||
+        this is PsiMember && getLanguage() == JavaLanguage.INSTANCE ||
         this is PsiDirectory ->
             isWritable() && ProjectRootsUtil.isInProjectSource(this)
         else ->
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfoStorage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfoStorage.kt
index cbb0365ff82..3ac142f37f5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfoStorage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfoStorage.kt
@@ -45,7 +45,7 @@ public class KotlinMemberInfoStorage(
             descriptor1 is FunctionDescriptor && descriptor is FunctionDescriptor -> {
                 !OverloadUtil.isOverloadable(descriptor1, descriptor)
             }
-            descriptor1 is PropertyDescriptor && descriptor is PropertyDescriptor,
+            descriptor1 is PropertyDescriptor && descriptor is PropertyDescriptor ||
             descriptor1 is ClassDescriptor && descriptor is ClassDescriptor -> true
             else -> false
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt
index 692b45c760b..6cc8aac20be 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt
@@ -28,7 +28,7 @@ public class KotlinMoveFilesOrDirectoriesHandler : MoveFilesOrDirectoriesHandler
     private fun adjustElements(elements: Array<out PsiElement>): Array<PsiElement>? {
         return elements.map {
             when {
-                it is PsiFile, it is PsiDirectory -> it
+                it is PsiFile || it is PsiDirectory -> it
                 it is PsiClass && it.getContainingClass() == null -> it.getContainingFile()
                 it is KtClassOrObject && it.getParent() is KtFile -> it.getParent()
                 else -> return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
index 15a1f2a1416..16aff373ad5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
@@ -114,9 +114,9 @@ public fun KtElement.getInternalReferencesToUpdateOnPackageNameChange(packageNam
         val oldPackageName = packageNameInfo.oldPackageName
         val newPackageName = packageNameInfo.newPackageName
         return when {
-            isExtension,
-            packageName == oldPackageName,
-            packageName?.asString() == newPackageName.asString(),
+            isExtension ||
+            packageName == oldPackageName ||
+            packageName?.asString() == newPackageName.asString() ||
             isImported(descriptor) -> {
                 if (isAncestor(declaration, false)) {
                     if (descriptor.importableFqName == null) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
index f8a7edee048..b341a5bcfa7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
@@ -176,11 +176,11 @@ public class KotlinPsiUnifier(
                 return when {
                     op1 == op2 ->
                         true
-                    op1 == KtTokens.NOT_IN, op2 == KtTokens.NOT_IN ->
+                    op1 == KtTokens.NOT_IN || op2 == KtTokens.NOT_IN ->
                         false
-                    op1 == KtTokens.EXCLEQ, op2 == KtTokens.EXCLEQ ->
+                    op1 == KtTokens.EXCLEQ || op2 == KtTokens.EXCLEQ ->
                         false
-                    op1 in OperatorConventions.COMPARISON_OPERATIONS, op2 in OperatorConventions.COMPARISON_OPERATIONS ->
+                    op1 in OperatorConventions.COMPARISON_OPERATIONS || op2 in OperatorConventions.COMPARISON_OPERATIONS ->
                         false
                     else ->
                         true
@@ -662,7 +662,7 @@ public class KotlinPsiUnifier(
 
         private fun matchResolvedInfo(e1: PsiElement, e2: PsiElement): Status? {
             return when {
-                e1 !is KtElement, e2 !is KtElement ->
+                e1 !is KtElement || e2 !is KtElement ->
                     null
 
                 e1 is KtDestructuringDeclaration && e2 is KtDestructuringDeclaration ->
diff --git a/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt
index c734c5f8f3b..4d8a090f190 100644
--- a/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt
+++ b/idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt
@@ -1,6 +1,6 @@
 fun test(n: Int): String {
     return <caret>when {
-        n < 0, n > 1000 -> "unknown"
+        n < 0 || n > 1000 -> "unknown"
         n <= 10 -> "small"
         n <= 100 -> "average"
         else -> "big"
diff --git a/idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt
index 6f2669017f5..b69f02078a4 100644
--- a/idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt
+++ b/idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt
@@ -3,7 +3,7 @@ fun test(n: Int): String {
     return <caret>when {
         n in 0..10 -> "small"
         n >= 10 && n <= 100 -> "average"
-        n < 0, n > 1000 -> "unknown"
+        n < 0 || n > 1000 -> "unknown"
         else -> "big"
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt b/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt
deleted file mode 100644
index aa84b8524a0..00000000000
--- a/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-fun test(n: Int): String {
-    return <caret>when {
-        n in 0..5, n in 5..10 -> "small"
-        n in 10..50, n in 50..100 -> "average"
-        n in 100..500, n in 500..1000 -> "big"
-        else -> "unknown"
-    }
-}
\ No newline at end of file
diff --git a/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt.after b/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt.after
deleted file mode 100644
index 88b38a37492..00000000000
--- a/idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt.after
+++ /dev/null
@@ -1,8 +0,0 @@
-fun test(n: Int): String {
-    return <caret>when (n) {
-        in 0..5, in 5..10 -> "small"
-        in 10..50, in 50..100 -> "average"
-        in 100..500, in 500..1000 -> "big"
-        else -> "unknown"
-    }
-}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 2543b7bbee0..3c219231c5c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -2062,12 +2062,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                     doTest(fileName);
                 }
 
-                @TestMetadata("whenWithRangeTestsAndMultiConditions.kt")
-                public void testWhenWithRangeTestsAndMultiConditions() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt");
-                    doTest(fileName);
-                }
-
                 @TestMetadata("whenWithSubject.kt")
                 public void testWhenWithSubject() throws Exception {
                     String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithSubject.kt");
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt
index 0a80f2626bc..07353e5ed9c 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt
@@ -102,8 +102,8 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() {
         )
 
         val diff = when {
-            newClassHeader.isCompatibleClassKind(),
-            newClassHeader.isCompatibleFileFacadeKind(),
+            newClassHeader.isCompatibleClassKind() ||
+            newClassHeader.isCompatibleFileFacadeKind() ||
             newClassHeader.isCompatibleMultifileClassPartKind() ->
                 difference(oldProto, newProto)
             else ->  {
diff --git a/js/js.translator/testData/expression/evaluationOrder/cases/whenWithComplexConditions.kt b/js/js.translator/testData/expression/evaluationOrder/cases/whenWithComplexConditions.kt
index 39f3dc6a0f4..5f84c1e88d4 100644
--- a/js/js.translator/testData/expression/evaluationOrder/cases/whenWithComplexConditions.kt
+++ b/js/js.translator/testData/expression/evaluationOrder/cases/whenWithComplexConditions.kt
@@ -10,13 +10,13 @@ fun id(s: String, value: Boolean): Boolean {
 fun box(): String {
 
     when {
-      id("A", true), id("B", true) -> 10
+      id("A", true) || id("B", true) -> 10
     }
     assertEquals("A", global)
 
     global = ""
     when {
-        id("A", false), id("B", true), id("C", true) -> 10
+        id("A", false) || id("B", true) || id("C", true) -> 10
     }
     assertEquals("AB", global)
 
@@ -39,14 +39,14 @@ fun box(): String {
     global = ""
     b = true
     when {
-        b, try { global += "A"; !b } finally {} -> 10
+        b || try { global += "A"; !b } finally {} -> 10
     }
     assertEquals("", global)
 
     global = ""
     b = false
     when {
-        b, try { global += "A"; !b } finally {} -> 10
+        b || try { global += "A"; !b } finally {} -> 10
     }
     assertEquals("A", global)
 
diff --git a/libraries/tools/idl2k/src/main/kotlin/typeMappings.kt b/libraries/tools/idl2k/src/main/kotlin/typeMappings.kt
index d419b2a7d2d..9c75c0edb6e 100644
--- a/libraries/tools/idl2k/src/main/kotlin/typeMappings.kt
+++ b/libraries/tools/idl2k/src/main/kotlin/typeMappings.kt
@@ -56,7 +56,7 @@ tailrec fun allSuperTypesImpl(roots: List<GenerateTraitOrClass>, all: Map<String
 
 fun standardTypes() = typeMapper.values.map {it.dropNullable()}.toSet()
 fun Type.dynamicIfUnknownType(allTypes: Set<String>, standardTypes: Set<Type> = standardTypes()): Type = when {
-    this is DynamicType, this is UnitType -> this
+    this is DynamicType || this is UnitType -> this
 
     this is SimpleType && this.type in allTypes -> this
     this.dropNullable() in standardTypes -> this