diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/HasPlatformTypeInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/HasPlatformTypeInspection.kt
index 60c16a15e51..1bfc5ab4687 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/HasPlatformTypeInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/HasPlatformTypeInspection.kt
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.inspections
 import com.intellij.codeInspection.IntentionWrapper
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.codeInspection.ProblemsHolder
+import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel
 import com.intellij.psi.PsiElementVisitor
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
@@ -33,8 +34,12 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.isFlexible
 import org.jetbrains.kotlin.types.isNullabilityFlexible
+import javax.swing.JComponent
+
+class HasPlatformTypeInspection(
+        @JvmField var publicAPIOnly: Boolean = true
+) : AbstractKotlinInspection() {
 
-class HasPlatformTypeInspection : AbstractKotlinInspection() {
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
         return object : KtVisitorVoid() {
             override fun visitNamedDeclaration(declaration: KtNamedDeclaration) {
@@ -49,7 +54,9 @@ class HasPlatformTypeInspection : AbstractKotlinInspection() {
                 if (declaration.containingClassOrObject?.isLocal() ?: false) return
 
                 val context = declaration.analyze(BodyResolveMode.PARTIAL)
-                val returnType = declaration.getReturnType(context) ?: return
+                val callable = context[BindingContext.DECLARATION_TO_DESCRIPTOR, declaration] as? CallableDescriptor ?: return
+                if (publicAPIOnly && !callable.visibility.isPublicAPI) return
+                val returnType = callable.returnType ?: return
                 if (!returnType.isFlexibleRecursive()) return
 
                 val fixes = mutableListOf(IntentionWrapper(SpecifyTypeExplicitlyIntention(), declaration.containingFile))
@@ -73,11 +80,6 @@ class HasPlatformTypeInspection : AbstractKotlinInspection() {
                 holder.registerProblem(problemDescriptor)
             }
 
-            private fun KtDeclaration.getReturnType(bindingContext: BindingContext): KotlinType? {
-                val callable = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, this] as? CallableDescriptor ?: return null
-                return callable.returnType
-            }
-
             private fun KotlinType.isFlexibleRecursive(): Boolean {
                 if (isFlexible()) return true
                 return arguments.any { it.type.isFlexibleRecursive() }
@@ -85,5 +87,9 @@ class HasPlatformTypeInspection : AbstractKotlinInspection() {
         }
     }
 
-
+    override fun createOptionsPanel(): JComponent? {
+        val panel = MultipleCheckboxOptionsPanel(this)
+        panel.addCheckbox("Apply only to public or protected members", "publicAPIOnly")
+        return panel
+    }
 }
\ No newline at end of file
diff --git a/idea/testData/inspections/hasPlatformType/function.kt b/idea/testData/inspections/hasPlatformType/function.kt
index c41deedf2c1..2dc794978b0 100644
--- a/idea/testData/inspections/hasPlatformType/function.kt
+++ b/idea/testData/inspections/hasPlatformType/function.kt
@@ -1,3 +1,9 @@
 // WITH_RUNTIME
 
-fun foo() = java.lang.String.valueOf(1)
\ No newline at end of file
+fun foo() = java.lang.String.valueOf(1)
+
+private fun foo() = java.lang.String.valueOf(2)
+
+open class My {
+    protected fun foo() = java.lang.String.valueOf(3)
+}
\ No newline at end of file
diff --git a/idea/testData/inspections/hasPlatformType/inspectionData/expected.xml b/idea/testData/inspections/hasPlatformType/inspectionData/expected.xml
index f4f660b9d2e..0edd710181a 100644
--- a/idea/testData/inspections/hasPlatformType/inspectionData/expected.xml
+++ b/idea/testData/inspections/hasPlatformType/inspectionData/expected.xml
@@ -7,6 +7,14 @@
         <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Function, property or variable has platform type.</problem_class>
         <description>Function has platform type. Make the type explicit to prevent subtle bugs.</description>
     </problem>
+    <problem>
+        <file>function.kt</file>
+        <line>8</line>
+        <module>light_idea_test_case</module>
+        <entry_point TYPE="file" FQNAME="temp:///src/function.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Function or property has platform type</problem_class>
+        <description>Function has platform type. Make the type explicit to prevent subtle bugs.</description>
+    </problem>
     <problem>
         <file>property1.kt</file>
         <line>3</line>