diff --git a/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java b/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java
index 497ea799f..d7ce59a0c 100644
--- a/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java
+++ b/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java
@@ -205,7 +205,7 @@ public void doHelp(StaplerRequest req, StaplerResponse rsp) throws IOException,
 
     @Restricted(DoNotUse.class) // accessed via REST API
     public HttpResponse doGenerateSnippet(StaplerRequest req, @QueryParameter String json) throws Exception {
-        // TODO is there not an easier way to do this?
+        // TODO JENKINS-31458 is there not an easier way to do this?
         JSONObject jsonO = JSONObject.fromObject(json);
         Jenkins j = Jenkins.getActiveInstance();
         Class<?> c = j.getPluginManager().uberClassLoader.loadClass(jsonO.getString("stapler-class"));
diff --git a/multibranch/src/main/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStep.java b/multibranch/src/main/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStep.java
index d662b3895..b58bb624d 100644
--- a/multibranch/src/main/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStep.java
+++ b/multibranch/src/main/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStep.java
@@ -127,7 +127,7 @@ public DescriptorImpl() {
 
         @Override public Step newInstance(StaplerRequest req, JSONObject formData) throws FormException {
             // A modified version of RequestImpl.TypePair.convertJSON.
-            // Works around the fact that Stapler does not call back into Descriptor.newInstance for nested objects.
+            // TODO JENKINS-31458 Works around the fact that Stapler does not call back into Descriptor.newInstance for nested objects.
             List<JobProperty> properties = new ArrayList<JobProperty>();
             ClassLoader cl = req.getStapler().getWebApp().getClassLoader();
             @SuppressWarnings("unchecked") Set<Map.Entry<String,Object>> entrySet = formData.getJSONObject("propertiesMap").entrySet();
diff --git a/step-api/src/test/java/org/jenkinsci/plugins/workflow/steps/StepConfigTester.java b/step-api/src/test/java/org/jenkinsci/plugins/workflow/steps/StepConfigTester.java
index d738eb6e7..08efb8d94 100644
--- a/step-api/src/test/java/org/jenkinsci/plugins/workflow/steps/StepConfigTester.java
+++ b/step-api/src/test/java/org/jenkinsci/plugins/workflow/steps/StepConfigTester.java
@@ -86,7 +86,7 @@ public static final class StepBuilder extends Builder {
                 return "Test step builder";
             }
             @Override public Builder newInstance(StaplerRequest req, JSONObject formData) throws FormException {
-                // TODO f:dropdownDescriptorSelector does not seem to work sensibly: the super method uses RequestImpl.bindJSON and ignores any StepDescriptor.newInstance override.
+                // TODO JENKINS-31458 f:dropdownDescriptorSelector does not seem to work sensibly: the super method uses RequestImpl.bindJSON and ignores any StepDescriptor.newInstance override.
                 // Cf. Snippetizer.doGenerateSnippet, which also seems to lack a standard way of parsing part of a form using databinding.
                 JSONObject s = formData.getJSONObject("s");
                 Jenkins j = Jenkins.getActiveInstance();