diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
index ca2c5c22c0..7df3835a3b 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
@@ -324,6 +324,7 @@ public class JSONConversionComponent extends    org.alfresco.repo.jscript.app.JS
                     for (ChildAssociationRef parent : parentAssocs)
                     {
                         // FIXME: What if there is more than a secondary parent?
+                        // RM-3930
                         if (!parent.isPrimary())
                         {
                             originatingLocation = parent.getParentRef();
@@ -334,6 +335,7 @@ public class JSONConversionComponent extends    org.alfresco.repo.jscript.app.JS
                             {
                                 // assume we have found the correct in-place location
                                 // FIXME when we support multiple in-place locations
+                                // See RM-3929
                                 break;
                             }
                         }
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java
index 2625d65e61..1aa31d64b6 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java
@@ -133,6 +133,7 @@ public class CreateTransferFolderAsNonAdminUserTest extends BaseRMTestCase
                 }, getAdminUserName());
 
                 // FIXME: This step should be executed in "when()".
+                // See RM-3931
                 transferFolder = (NodeRef) rmActionService.executeRecordsManagementAction(recordsFolder, TransferAction.NAME).getValue();
             }
 
@@ -142,7 +143,7 @@ public class CreateTransferFolderAsNonAdminUserTest extends BaseRMTestCase
             @Override
             public void when()
             {
-                // FIXME: If the transfer step is executed here the test fails?!?
+                // FIXME: If the transfer step is executed here the test fails?!? See RM-3931
                 //transferFolder = (NodeRef) rmActionService.executeRecordsManagementAction(recordsFolder, TransferAction.NAME).getValue();
             }
 
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java
index aef3197421..e3c4e971af 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java
@@ -140,6 +140,7 @@ public class FilingPermissionsOnTransferFolderTest extends BaseRMTestCase
                 }, getAdminUserName());
 
                 // FIXME: This step should be executed in "when()".
+                // See RM-3931
                 transferFolder = (NodeRef) rmActionService.executeRecordsManagementAction(recordsFolder, TransferAction.NAME).getValue();
             }
 
@@ -149,7 +150,7 @@ public class FilingPermissionsOnTransferFolderTest extends BaseRMTestCase
             @Override
             public void when()
             {
-                // FIXME: If the transfer step is executed here the test fails.
+                // FIXME: If the transfer step is executed here the test fails. See RM-3931
                 //transferFolder = (NodeRef) rmActionService.executeRecordsManagementAction(recordsFolder, TransferAction.NAME).getValue();
 
                 // Give testUser2 filing permissions on transfer folder
@@ -187,7 +188,7 @@ public class FilingPermissionsOnTransferFolderTest extends BaseRMTestCase
                         // Check if testUser2 has filing permissions on the transfer folder
                         assertEquals(ALLOWED,  permissionService.hasPermission(transferFolder, FILING));
 
-                        // FIXME: Should be able to execute the action. Failing intermittently.
+                        // FIXME: Should be able to execute the action. Failing intermittently. See RM-3931
                         // Execute transfer complete action as testUser2 who has filing permissions on the transfer folder
                         // rmActionService.executeRecordsManagementAction(transferFolder, TransferCompleteAction.NAME);
 
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java
index d826a576cb..ab3d4676f7 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java
@@ -140,6 +140,7 @@ public class NoPermissionsOnTransferFolderTest extends BaseRMTestCase
                 }, getAdminUserName());
 
                 // FIXME: This step should be executed in "when()".
+                // See RM-3931
                 transferFolder = (NodeRef) rmActionService.executeRecordsManagementAction(recordsFolder, TransferAction.NAME).getValue();
             }
 
@@ -149,7 +150,7 @@ public class NoPermissionsOnTransferFolderTest extends BaseRMTestCase
             @Override
             public void when()
             {
-                // FIXME: If the transfer step is executed here the test fails.
+                // FIXME: If the transfer step is executed here the test fails. See RM-3931
                 //transferFolder = (NodeRef) rmActionService.executeRecordsManagementAction(recordsFolder, TransferAction.NAME).getValue();
             }
 
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java
index f183134b43..6c92ade903 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java
@@ -144,6 +144,7 @@ public class ReadPermissionsOnTransferFolderTest extends BaseRMTestCase
                 }, getAdminUserName());
 
                 // FIXME: This step should be executed in "when()".
+                // See RM-3931
                 transferFolder = (NodeRef) rmActionService.executeRecordsManagementAction(recordsFolder, TransferAction.NAME).getValue();
             }
 
@@ -153,7 +154,7 @@ public class ReadPermissionsOnTransferFolderTest extends BaseRMTestCase
             @Override
             public void when()
             {
-                // FIXME: If the transfer step is executed here the test fails.
+                // FIXME: If the transfer step is executed here the test fails. See RM-3931
                 //transferFolder = (NodeRef) rmActionService.executeRecordsManagementAction(recordsFolder, TransferAction.NAME).getValue();
 
                 // Give testUser2 read permissions on transfer folder