diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 75601792c7..e2e7e7ce69 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -25,6 +25,7 @@
  */
 package hudson;
 
+import hudson.model.Slave;
 import jenkins.util.SystemProperties;
 import hudson.cli.CLICommand;
 import hudson.console.ConsoleAnnotationDescriptor;
@@ -158,6 +159,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.CheckForNull;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 
 /**
  * Utility functions used in views.
@@ -889,10 +891,24 @@ public class Functions {
         return SCM._for(project);
     }
 
+    /**
+     * @since 2.12
+     * @deprecated replaced by {@link Slave.SlaveDescriptor#computerLauncherDescriptors(Slave)}
+     */
+    @Deprecated
+    @Restricted(DoNotUse.class)
+    @RestrictedSince("2.12")
     public static List<Descriptor<ComputerLauncher>> getComputerLauncherDescriptors() {
         return Jenkins.getInstance().<ComputerLauncher,Descriptor<ComputerLauncher>>getDescriptorList(ComputerLauncher.class);
     }
 
+    /**
+     * @since 2.12
+     * @deprecated replaced by {@link Slave.SlaveDescriptor#retentionStrategyDescriptors(Slave)}
+     */
+    @Deprecated
+    @Restricted(DoNotUse.class)
+    @RestrictedSince("2.12")
     public static List<Descriptor<RetentionStrategy<?>>> getRetentionStrategyDescriptors() {
         return RetentionStrategy.all();
     }
@@ -913,6 +929,13 @@ public class Functions {
         return MyViewsTabBar.all();
     }
 
+    /**
+     * @deprecated replaced by {@link Slave.SlaveDescriptor#nodePropertyDescriptors(Slave)}
+     * @since 2.12
+     */
+    @Deprecated
+    @Restricted(DoNotUse.class)
+    @RestrictedSince("2.12")
     public static List<NodePropertyDescriptor> getNodePropertyDescriptors(Class<? extends Node> clazz) {
         List<NodePropertyDescriptor> result = new ArrayList<NodePropertyDescriptor>();
         Collection<NodePropertyDescriptor> list = (Collection) Jenkins.getInstance().getDescriptorList(NodeProperty.class);
diff --git a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java
index bd5cbfd36e..bc3f7d98ea 100644
--- a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java
+++ b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java
@@ -3,6 +3,8 @@ package hudson.model;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.scm.SCMDescriptor;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import jenkins.ExtensionFilter;
 
 import java.util.ArrayList;
@@ -22,6 +24,22 @@ public abstract class DescriptorVisibilityFilter implements ExtensionPoint {
 
     private static final Logger LOGGER = Logger.getLogger(DescriptorVisibilityFilter.class.getName());
 
+    /**
+     * Decides if the given descriptor should be visible to the user.
+     *
+     * @param contextClass The class of object that indicates where the visibility of a descriptor is evaluated.
+     *                   For example, if Jenkins is deciding whether a {@link FreeStyleProject} should gets a
+     *                   {@link SCMDescriptor}, the context class will be {@link FreeStyleProject}.
+     * @param descriptor Descriptor whose visibility is evaluated. Never null.
+     * @return true to allow the descriptor to be visible. false to hide it.
+     * If any of the installed {@link DescriptorVisibilityFilter} returns false,
+     * the descriptor is not shown.
+     * @since FIXME
+     */
+    public boolean filterType(@Nonnull Class<?> contextClass, @Nonnull Descriptor descriptor) {
+        return true;
+    }
+
     /**
      * Decides if the given descriptor should be visible to the user.
      *
@@ -38,7 +56,7 @@ public abstract class DescriptorVisibilityFilter implements ExtensionPoint {
      *      If any of the installed {@link DescriptorVisibilityFilter} returns false,
      *      the descriptor is not shown.
      */
-    public abstract boolean filter(Object context, Descriptor descriptor);
+    public abstract boolean filter(@CheckForNull Object context, @Nonnull Descriptor descriptor);
 
     public static ExtensionList<DescriptorVisibilityFilter> all() {
         return ExtensionList.lookup(DescriptorVisibilityFilter.class);
@@ -47,7 +65,8 @@ public abstract class DescriptorVisibilityFilter implements ExtensionPoint {
     public static <T extends Descriptor> List<T> apply(Object context, Iterable<T> source) {
         ExtensionList<DescriptorVisibilityFilter> filters = all();
         List<T> r = new ArrayList<T>();
-        
+        Class<?> contextClass = context == null ? null : context.getClass();
+
         OUTER:
         for (T d : source) {
             if (LOGGER.isLoggable(Level.FINE)) {
@@ -57,6 +76,12 @@ public abstract class DescriptorVisibilityFilter implements ExtensionPoint {
                 if (LOGGER.isLoggable(Level.FINER)) {
                     LOGGER.finer("Querying " + f + " for visibility of " + d + " in " + context);
                 }
+                if (contextClass != null && !f.filterType(contextClass, d)) {
+                    if (LOGGER.isLoggable(Level.CONFIG)) {
+                        LOGGER.config("Filter " + f + " hides " + d + " in contexts of type " + contextClass);
+                    }
+                    continue OUTER; // veto-ed. not shown
+                }
                 if (!f.filter(context,d)) {
                     if (LOGGER.isLoggable(Level.CONFIG)) {
                        LOGGER.config("Filter " + f + " hides " + d + " in context " + context);
@@ -68,4 +93,29 @@ public abstract class DescriptorVisibilityFilter implements ExtensionPoint {
         }
         return r;
     }
+
+    public static <T extends Descriptor> List<T> applyType(Class<?> contextClass, Iterable<T> source) {
+        ExtensionList<DescriptorVisibilityFilter> filters = all();
+        List<T> r = new ArrayList<T>();
+
+        OUTER:
+        for (T d : source) {
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.fine("Determining visibility of " + d + " in contexts of type " + contextClass);
+            }
+            for (DescriptorVisibilityFilter f : filters) {
+                if (LOGGER.isLoggable(Level.FINER)) {
+                    LOGGER.finer("Querying " + f + " for visibility of " + d + " in type " + contextClass);
+                }
+                if (contextClass != null && !f.filterType(contextClass, d)) {
+                    if (LOGGER.isLoggable(Level.CONFIG)) {
+                        LOGGER.config("Filter " + f + " hides " + d + " in contexts of type " + contextClass);
+                    }
+                    continue OUTER; // veto-ed. not shown
+                }
+            }
+            r.add(d);
+        }
+        return r;
+    }
 }
diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index 36d38fdc6f..d408d9f60b 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -25,11 +25,11 @@
 package hudson.model;
 
 import com.google.common.collect.ImmutableSet;
+import hudson.DescriptorExtensionList;
 import hudson.FilePath;
 import hudson.Launcher;
-import hudson.Util;
 import hudson.Launcher.RemoteLauncher;
-import jenkins.util.SystemProperties;
+import hudson.Util;
 import hudson.model.Descriptor.FormException;
 import hudson.remoting.Callable;
 import hudson.slaves.CommandLauncher;
@@ -44,7 +44,6 @@ import hudson.slaves.SlaveComputer;
 import hudson.util.ClockDifference;
 import hudson.util.DescribableList;
 import hudson.util.FormValidation;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -53,19 +52,16 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
-
-import javax.servlet.ServletException;
-
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.security.MasterToSlaveCallable;
 import jenkins.slaves.WorkspaceLocator;
-
+import jenkins.util.SystemProperties;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundSetter;
@@ -488,6 +484,59 @@ public abstract class Slave extends Node implements Serializable {
 
             return FormValidation.ok();
         }
+
+        /**
+         * Returns the list of {@link ComputerLauncher} descriptors appropriate to the supplied {@link Slave}.
+         *
+         * @param it the {@link Slave} or {@code null} to assume the slave is of type {@link #clazz}.
+         * @return the filtered list
+         * @since 2.12
+         */
+        @Nonnull
+        public List<Descriptor<ComputerLauncher>> computerLauncherDescriptors(@CheckForNull Slave it) {
+            DescriptorExtensionList<ComputerLauncher, Descriptor<ComputerLauncher>> all =
+                    Jenkins.getInstance().<ComputerLauncher, Descriptor<ComputerLauncher>>getDescriptorList(
+                            ComputerLauncher.class);
+            return it == null ? DescriptorVisibilityFilter.applyType(clazz, all)
+                    : DescriptorVisibilityFilter.apply(it, all);
+        }
+
+        /**
+         * Returns the list of {@link RetentionStrategy} descriptors appropriate to the supplied {@link Slave}.
+         *
+         * @param it the {@link Slave} or {@code null} to assume the slave is of type {@link #clazz}.
+         * @return the filtered list
+         * @since 2.12
+         */
+        @Nonnull
+        public List<Descriptor<RetentionStrategy<?>>> retentionStrategyDescriptors(@CheckForNull Slave it) {
+            return it == null ? DescriptorVisibilityFilter.applyType(clazz, RetentionStrategy.all())
+                    : DescriptorVisibilityFilter.apply(it, RetentionStrategy.all());
+        }
+
+        /**
+         * Returns the list of {@link NodePropertyDescriptor} appropriate to the supplied {@link Slave}.
+         *
+         * @param it the {@link Slave} or {@code null} to assume the slave is of type {@link #clazz}.
+         * @return the filtered list
+         * @since 2.12
+         */
+        @SuppressWarnings("unchecked")
+        @Nonnull
+        public List<NodePropertyDescriptor> nodePropertyDescriptors(@CheckForNull Slave it) {
+            List<NodePropertyDescriptor> result = new ArrayList<NodePropertyDescriptor>();
+            Collection<NodePropertyDescriptor> list =
+                    (Collection) Jenkins.getInstance().getDescriptorList(NodeProperty.class);
+            for (NodePropertyDescriptor npd : it == null
+                    ? DescriptorVisibilityFilter.applyType(clazz, list)
+                    : DescriptorVisibilityFilter.apply(it, list)) {
+                if (npd.isApplicable(clazz)) {
+                    result.add(npd);
+                }
+            }
+            return result;
+        }
+
     }
 
 
diff --git a/core/src/main/java/hudson/slaves/DelegatingComputerLauncher.java b/core/src/main/java/hudson/slaves/DelegatingComputerLauncher.java
index 47a9b0815b..510b0db957 100644
--- a/core/src/main/java/hudson/slaves/DelegatingComputerLauncher.java
+++ b/core/src/main/java/hudson/slaves/DelegatingComputerLauncher.java
@@ -23,13 +23,19 @@
  */
 package hudson.slaves;
 
-import hudson.Functions;
+import hudson.RestrictedSince;
 import hudson.model.Descriptor;
+import hudson.model.Slave;
 import hudson.model.TaskListener;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import jenkins.model.Jenkins;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 
 /**
  * Convenient base implementation of {@link ComputerLauncher} that allows
@@ -70,10 +76,29 @@ public abstract class DelegatingComputerLauncher extends ComputerLauncher {
         /**
          * Returns the applicable nested computer launcher types.
          * The default implementation avoids all delegating descriptors, as that creates infinite recursion.
+         * @since 2.12
          */
+        public List<Descriptor<ComputerLauncher>> applicableDescriptors(@CheckForNull Slave it,
+                                                                        @Nonnull Slave.SlaveDescriptor itDescriptor) {
+            List<Descriptor<ComputerLauncher>> r = new ArrayList<Descriptor<ComputerLauncher>>();
+            for (Descriptor<ComputerLauncher> d : itDescriptor.computerLauncherDescriptors(it)) {
+                if (DelegatingComputerLauncher.class.isAssignableFrom(d.getKlass().toJavaClass()))  continue;
+                r.add(d);
+            }
+            return r;
+        }
+        /**
+         * Returns the applicable nested computer launcher types.
+         * The default implementation avoids all delegating descriptors, as that creates infinite recursion.
+         * @deprecated use {@link #applicableDescriptors(Slave, Slave.SlaveDescriptor)}
+         */
+        @Deprecated
+        @Restricted(DoNotUse.class)
+        @RestrictedSince("2.12")
         public List<Descriptor<ComputerLauncher>> getApplicableDescriptors() {
             List<Descriptor<ComputerLauncher>> r = new ArrayList<Descriptor<ComputerLauncher>>();
-            for (Descriptor<ComputerLauncher> d : Functions.getComputerLauncherDescriptors()) {
+            for (Descriptor<ComputerLauncher> d :
+                    Jenkins.getInstance().<ComputerLauncher, Descriptor<ComputerLauncher>>getDescriptorList(ComputerLauncher.class)) {
                 if (DelegatingComputerLauncher.class.isAssignableFrom(d.getKlass().toJavaClass()))  continue;
                 r.add(d);
             }
diff --git a/core/src/main/resources/hudson/slaves/DelegatingComputerLauncher/config.jelly b/core/src/main/resources/hudson/slaves/DelegatingComputerLauncher/config.jelly
index 843cb9d3c9..798f805eed 100644
--- a/core/src/main/resources/hudson/slaves/DelegatingComputerLauncher/config.jelly
+++ b/core/src/main/resources/hudson/slaves/DelegatingComputerLauncher/config.jelly
@@ -25,5 +25,5 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
-  <f:dropdownDescriptorSelector title="${%Actual launch method}" field="launcher" descriptors="${descriptor.getApplicableDescriptors()}" />
+  <f:dropdownDescriptorSelector title="${%Actual launch method}" field="launcher" descriptors="${descriptor.applicableDescriptors(it,itDescriptor)}" />
 </j:jelly>
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
index 667e123f29..c06a9e1d35 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
@@ -47,9 +47,10 @@ THE SOFTWARE.
   <f:slave-mode name="mode" node="${it}" />
 
   <!-- TODO: should be packaged as a tag -->
+  <j:set var="itDescriptor" value="${descriptor}"/>
   <f:dropdownList name="slave.launcher" title="${%Launch method}"
                   help="${descriptor.getHelpFile('launcher')}">
-    <j:forEach var="d" items="${h.getComputerLauncherDescriptors()}">
+    <j:forEach var="d" items="${descriptor.computerLauncherDescriptors(it)}">
       <f:dropdownListBlock value="${d.clazz.name}" name="${d.displayName}"
                            selected="${it.launcher.descriptor==d}"
                            title="${d.displayName}">
@@ -63,10 +64,11 @@ THE SOFTWARE.
   </f:dropdownList>
 
   <!-- pointless to show this if there's only one option, which is the default -->
-  <j:if test="${h.getRetentionStrategyDescriptors().size() gt 1}">
+  <j:set var="retentionStrategies" value="${descriptor.retentionStrategyDescriptors(it)}"/>
+  <j:if test="${retentionStrategies.size() gt 1}">
     <f:dropdownList name="slave.retentionStrategy" title="${%Availability}"
                     help="/help/system-config/master-slave/availability.html">
-      <j:forEach var="d" items="${h.getRetentionStrategyDescriptors()}">
+      <j:forEach var="d" items="${retentionStrategies}">
         <j:if test="${d != null}">
           <f:dropdownListBlock value="${d.clazz.name}" name="${d.displayName}"
                                selected="${it.retentionStrategy.descriptor==d}"
@@ -82,6 +84,8 @@ THE SOFTWARE.
     </f:dropdownList>
   </j:if>
 
-  <f:descriptorList title="${%Node Properties}" descriptors="${h.getNodePropertyDescriptors(descriptor.clazz)}" field="nodeProperties" />
+  <f:descriptorList title="${%Node Properties}"
+                    descriptors="${descriptor.nodePropertyDescriptors(it)}"
+                    field="nodeProperties" />
   
 </j:jelly>
diff --git a/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java b/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java
index 3b76651562..5d47c1a2af 100644
--- a/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java
+++ b/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java
@@ -65,7 +65,7 @@ public class DelegatingComputerLauncherTest {
 
         assertTrue("DelegatingComputerLauncher should filter out other DelegatingComputerLauncher instances " +
                    "from its descriptor's getApplicableDescriptors() method",
-                new DummyTwo.DummyTwoDescriptor().getApplicableDescriptors().isEmpty());
+                new DummyTwo.DummyTwoDescriptor().applicableDescriptors(null, new DumbSlave.DescriptorImpl()).isEmpty());
     }
 
 }