diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmBridgesImpl.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmBridgesImpl.kt
index f7e8fcb922a..9444d9c9137 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmBridgesImpl.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmBridgesImpl.kt
@@ -5,13 +5,13 @@
 
 package org.jetbrains.kotlin.codegen
 
-import org.jetbrains.kotlin.backend.common.bridges.Bridge
-import org.jetbrains.kotlin.backend.common.bridges.DescriptorBasedFunctionHandle
-import org.jetbrains.kotlin.backend.common.bridges.generateBridges
+import org.jetbrains.kotlin.backend.common.bridges.*
 import org.jetbrains.kotlin.config.JvmTarget
+import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.jvm.annotations.hasJvmDefaultAnnotation
+import org.jetbrains.kotlin.resolve.jvm.annotations.hasPlatformDependentAnnotation
 
 class DescriptorBasedFunctionHandleForJvm(
     descriptor: FunctionDescriptor,
@@ -27,14 +27,32 @@ class DescriptorBasedFunctionHandleForJvm(
         the method in the interface is abstract so we must not generate bridges for such cases.
     */
     override val isAbstract: Boolean = super.isAbstract || isAbstractOnJvmIgnoringActualModality(jvmTarget, descriptor)
+
+    override val mayBeUsedAsSuperImplementation: Boolean =
+        super.mayBeUsedAsSuperImplementation || descriptor.isJvmDefaultOrPlatformDependent()
+
+    override val isDeclaration: Boolean =
+        descriptor.kind.isReal || needToGenerateDelegationToDefaultImpls(descriptor)
+}
+
+private fun CallableMemberDescriptor.isJvmDefaultOrPlatformDependent() =
+    hasJvmDefaultAnnotation() || hasPlatformDependentAnnotation()
+
+private fun needToGenerateDelegationToDefaultImpls(descriptor: FunctionDescriptor): Boolean {
+    if (findInterfaceImplementation(descriptor) == null) return false
+    val overriddenFromInterface = findImplementationFromInterface(descriptor) ?: return false
+
+    return !overriddenFromInterface.isJvmDefaultOrPlatformDependent()
 }
 
 /**
- * @return return true for interface method not annotated with @JvmDefault
+ * @return return true for interface method not annotated with @JvmDefault or @PlatformDependent
  */
 fun isAbstractOnJvmIgnoringActualModality(jvmTarget: JvmTarget, descriptor: FunctionDescriptor): Boolean {
     if (!DescriptorUtils.isInterface(descriptor.containingDeclaration)) return false
-    return jvmTarget == JvmTarget.JVM_1_6 || !descriptor.hasJvmDefaultAnnotation()
+    if (jvmTarget == JvmTarget.JVM_1_6) return true
+
+    return !descriptor.isJvmDefaultOrPlatformDependent()
 }
 
 fun <Signature> generateBridgesForFunctionDescriptorForJvm(
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotations/jvmAnnotationUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotations/jvmAnnotationUtil.kt
index f41b9c26a56..aec5ade20df 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotations/jvmAnnotationUtil.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotations/jvmAnnotationUtil.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.Annotated
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.descriptors.deserialization.PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.load.java.JvmAbi.JVM_FIELD_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -45,6 +46,9 @@ fun DeclarationDescriptor.isCallableMemberWithJvmDefaultAnnotation(): Boolean =
 fun CallableMemberDescriptor.hasJvmDefaultAnnotation(): Boolean =
     DescriptorUtils.getDirectMember(this).annotations.hasAnnotation(JVM_DEFAULT_FQ_NAME)
 
+fun CallableMemberDescriptor.hasPlatformDependentAnnotation(): Boolean =
+    DescriptorUtils.getDirectMember(this).annotations.hasAnnotation(PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME)
+
 private fun Annotated.findJvmSyntheticAnnotation(): AnnotationDescriptor? =
     annotations.findAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME)
         ?: (this as? PropertyDescriptor)?.backingField?.annotations?.findAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME)
diff --git a/compiler/testData/codegen/box/specialBuiltins/mapGetOrDefault.kt b/compiler/testData/codegen/box/specialBuiltins/mapGetOrDefault.kt
new file mode 100644
index 00000000000..355c9415261
--- /dev/null
+++ b/compiler/testData/codegen/box/specialBuiltins/mapGetOrDefault.kt
@@ -0,0 +1,90 @@
+// IGNORE_BACKEND: JVM_IR
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_RUNTIME
+// FULL_JDK
+
+// FILE: TestMap.java
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+
+public class TestMap implements Map<String, Object> {
+    @Override
+    public int size() {
+        return 0;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return false;
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return false;
+    }
+
+    @Override
+    public Object get(Object key) {
+        return null;
+    }
+
+
+    @Override
+    public Object put(String key, Object value) {
+        return null;
+    }
+
+    @Override
+    public Object remove(Object key) {
+        return null;
+    }
+
+    @Override
+    public void putAll(Map<? extends String, ?> m) {
+
+    }
+
+    @Override
+    public void clear() {
+
+    }
+
+
+    @Override
+    public Set<String> keySet() {
+        return null;
+    }
+
+
+    @Override
+    public Collection<Object> values() {
+        return null;
+    }
+
+
+    @Override
+    public Set<Entry<String, Object>> entrySet() {
+        return null;
+    }
+}
+
+// FILE: main.kt
+
+class MyMap: TestMap()
+
+fun box(): String {
+    val map = MyMap()
+    if (map.remove("aaa", 42)) return "fail 1"
+    if (map.getOrDefault("aaa", 42) != 42) return "fail 2"
+
+    return "OK"
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
index 799a85a4693..9e638222e1a 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
@@ -22905,6 +22905,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/specialBuiltins/irrelevantRemoveAtOverride.kt");
         }
 
+        @TestMetadata("mapGetOrDefault.kt")
+        public void testMapGetOrDefault() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/mapGetOrDefault.kt");
+        }
+
         @TestMetadata("maps.kt")
         public void testMaps() throws Exception {
             runTest("compiler/testData/codegen/box/specialBuiltins/maps.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index be1d851999b..0da3a84a2fe 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -22905,6 +22905,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/specialBuiltins/irrelevantRemoveAtOverride.kt");
         }
 
+        @TestMetadata("mapGetOrDefault.kt")
+        public void testMapGetOrDefault() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/mapGetOrDefault.kt");
+        }
+
         @TestMetadata("maps.kt")
         public void testMaps() throws Exception {
             runTest("compiler/testData/codegen/box/specialBuiltins/maps.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
index d5c590b278b..d080d3b9d65 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
@@ -22910,6 +22910,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/specialBuiltins/irrelevantRemoveAtOverride.kt");
         }
 
+        @TestMetadata("mapGetOrDefault.kt")
+        public void testMapGetOrDefault() throws Exception {
+            runTest("compiler/testData/codegen/box/specialBuiltins/mapGetOrDefault.kt");
+        }
+
         @TestMetadata("maps.kt")
         public void testMaps() throws Exception {
             runTest("compiler/testData/codegen/box/specialBuiltins/maps.kt");