Index: include/lldb/API/SBThreadPlan.h
===================================================================
--- include/lldb/API/SBThreadPlan.h
+++ include/lldb/API/SBThreadPlan.h
@@ -88,6 +88,8 @@
 
   SBThreadPlan QueueThreadPlanForRunToAddress(SBAddress address);
 
+  SBThreadPlan QueueThreadPlanForStepScripted(const char *script_class_name);
+
 #ifndef SWIG
   lldb_private::ThreadPlan *get();
 #endif
Index: scripts/interface/SBThreadPlan.i
===================================================================
--- scripts/interface/SBThreadPlan.i
+++ scripts/interface/SBThreadPlan.i
@@ -106,6 +106,9 @@
     SBThreadPlan
     QueueThreadPlanForRunToAddress (SBAddress address);
 
+    SBThreadPlan
+    QueueThreadPlanForStepScripted(const char *script_class_name);
+
 
 protected:
     friend class SBBreakpoint;
Index: source/API/SBThreadPlan.cpp
===================================================================
--- source/API/SBThreadPlan.cpp
+++ source/API/SBThreadPlan.cpp
@@ -207,3 +207,13 @@
     return SBThreadPlan();
   }
 }
+
+SBThreadPlan
+SBThreadPlan::QueueThreadPlanForStepScripted(const char *script_class_name) {
+  if (m_opaque_sp) {
+    return SBThreadPlan(m_opaque_sp->GetThread().QueueThreadPlanForStepScripted(
+        false, script_class_name, false));
+  } else {
+    return SBThreadPlan();
+  }
+}