diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
index 032486de79..9b9f1d3725 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
@@ -107,14 +107,17 @@
    <bean id="rmLinkToRecordsCapability"
       parent="declarativeCapability">
       <property name="name" value="LinkToRecords"/>
-      <property name="private" value="true" />
+      <property name="permission" value="LinkToRecords" />
       <property name="conditions">
-         <map>
+         <map>            
+            <entry key="capabilityCondition.filling" value="true"/>
             <entry key="capabilityCondition.frozen" value="false"/>
             <entry key="capabilityCondition.recordFiled" value="true"/>	  <!--  Can only link a filed record -->
          </map>
       </property>
-      <property name="targetCapability" ref="rmFileRecordsCapability" />
+      <property name="targetCapability" ref="rmFilePermissionOnly" />
+      <property name="group"><ref bean="recordsGroup"/></property>
+      <property name="index" value="45" />
    </bean>
 
    <bean id="rmFileUnfiledRecordsCapability"                              
@@ -128,10 +131,24 @@
             <entry key="capabilityCondition.recordFiled" value="false"/>	<!--  Checks that the node hasn't been filed -->
          </map>
       </property>
-      <property name="targetCapability" ref="rmFileRecordsCapability" />  <!--  Checks that the user has the correct capability on the destination folder -->      
+      <property name="targetCapability" ref="rmFilePermissionOnly" />   <!--  Checks that the user has the correct capability on the destination folder -->      
       <property name="group"><ref bean="recordsGroup"/></property>
       <property name="index" value="41" />
    </bean>
+   
+   <bean id="rmFilePermissionOnly"                                                             
+         parent="declarativeCapability" >                                  <!--  Checks for filling permission only, useful for destination checks -->
+      <property name="name" value="FillingPermissionOnly"/>	       
+      <property name="private" value="true" />					
+      <property name="conditions">
+         <map>
+            <entry key="capabilityCondition.filling" value="true"/>  		<!--  Checks if the user has the filling capability -->
+            <entry key="capabilityCondition.closed" value="false"/>            
+            <entry key="capabilityCondition.frozen" value="false"/>
+            <entry key="capabilityCondition.cutoff" value="false"/>
+         </map>
+      </property>
+   </bean>
 
    <bean id="rmDeclareRecordsCapability"
       parent="declarativeCapability">
@@ -242,13 +259,14 @@
       <property name="undetermined" value="true" />
       <property name="kind" value="RECORD" />
       <property name="conditions">
-         <map>
+         <map>            
+            <entry key="capabilityCondition.filling" value="true"/>
             <entry key="capabilityCondition.frozen" value="false"/>
             <entry key="capabilityCondition.recordFiled" value="true"/>		<!--  Can only move a filed record -->
             <entry key="capabilityCondition.cutoff" value="false"/>          <!-- Can not move a record once it is cutoff -->
          </map>
       </property>
-      <property name="targetCapability" ref="rmFileRecordsCapability"/>
+      <property name="targetCapability" ref="rmFilePermissionOnly"/>
       <property name="group"><ref bean="recordsGroup"/></property>
       <property name="index" value="40" />
    </bean>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
index 516802817e..38f3346254 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
@@ -5,8 +5,9 @@ capability.ViewRecords.title=View Records
 capability.UndeclareRecords.title=Reopen Records
 capability.CreateRecords.title=Create Records
 capability.RequestRecordInformation.title=Request Record Information
-capability.RejectRecords=Reject Records
-capability.FileUnfiledRecords=File Unfiled Records
+capability.RejectRecords.title=Reject Records
+capability.FileUnfiledRecords.title=File Unfiled Records
+capability.LinkToRecords.title=Link Records
 
 # Metadata Control
 capability.group.metadataControl.title=Metadata Control
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
index 4a6c1d9625..1f8807b4ce 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
@@ -86,6 +86,7 @@
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="FileDestructionReport"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="FileUnfiledRecords"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="RejectRecords"/>
+            <includePermissionGroup type="rma:filePlanComponent" permissionGroup="LinkToRecords"/>
         </permissionGroup>
         
         <permissionGroup name="Filing" allowFullControl="false" expose="true">
@@ -164,6 +165,7 @@
         <permissionGroup name="FileDestructionReport" expose="false" allowFullControl="false"/>
         <permissionGroup name="RejectRecords" expose="false" allowFullControl="false"/>
         <permissionGroup name="FileUnfiledRecords" expose="false" allowFullControl="false"/>
+        <permissionGroup name="LinkToRecords" expose="false" allowFullControl="false"/>
         
         <!--  End -->
         
@@ -433,6 +435,10 @@
             <grantedToGroup permissionGroup="RejectRecords"/>
         </permission>
         
+        <permission name="_LinkToRecords" expose="false">
+            <grantedToGroup permissionGroup="LinkToRecords"/>
+        </permission>
+        
     </permissionSet>
     
 </permissions>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
index 3ee7b4a81b..1b35b40b58 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
@@ -48,7 +48,8 @@
          "PlanningReviewCycles",
          "RequestRecordInformation",
          "FileUnfiledRecords",
-         "RejectRecords"
+         "RejectRecords",
+         "LinkToRecords"
       ]
    },
    {
@@ -71,7 +72,8 @@
           "PlanningReviewCycles",
           "RequestRecordInformation",
           "FileUnfiledRecords",
-          "RejectRecords"
+          "RejectRecords",
+          "LinkToRecords"
       ]
    },
    {
@@ -134,7 +136,8 @@
           "RequestRecordInformation",
           "FileDestructionReport",
           "FileUnfiledRecords",
-          "RejectRecords"
+          "RejectRecords",
+          "LinkToRecords"
       ]
    },
    {
@@ -199,7 +202,8 @@
           "RequestRecordInformation",
           "FileDestructionReport",
           "FileUnfiledRecords",
-          "RejectRecords"
+          "RejectRecords",
+          "LinkToRecords"
       ]
    }
 ]
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordCopyBehaviours.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordCopyBehaviours.java
index e5225e5011..359871e21d 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordCopyBehaviours.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordCopyBehaviours.java
@@ -370,12 +370,20 @@ public class RecordCopyBehaviours implements RecordsManagementModel
         final NodeService nodeService = rmServiceRegistry.getNodeService();
         
         //Generate the id for the copy
-        String id = rmIdentifierService.generateIdentifier(nodeService.getType(nodeService.getPrimaryParent(targetNodeRef).getParentRef()), (nodeService.getPrimaryParent(targetNodeRef).getParentRef()));
+        String id = rmIdentifierService.generateIdentifier(
+                                            nodeService.getType(nodeService.getPrimaryParent(targetNodeRef).getParentRef()), 
+                                            (nodeService.getPrimaryParent(targetNodeRef).getParentRef()));
         
         //We need to allow the id to be overwritten disable the policy protecting changes to the id
-        behaviourFilter.disableBehaviour(targetNodeRef, ASPECT_RECORD_COMPONENT_ID);
-        nodeService.setProperty(targetNodeRef, PROP_IDENTIFIER, id);
-        behaviourFilter.enableBehaviour(targetNodeRef, ASPECT_RECORD_COMPONENT_ID);
+        behaviourFilter.disableBehaviour();
+        try
+        {
+            nodeService.setProperty(targetNodeRef, PROP_IDENTIFIER, id);
+        }
+        finally
+        {
+            behaviourFilter.enableBehaviour();
+        }
     }
     
     /**
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java
index b6623e798d..100a458ffe 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java
@@ -129,8 +129,14 @@ public class RMv21CapabilityPatch extends ModulePatchComponent
                           FilePlanRoleService.ROLE_ADMIN, 
                           FilePlanRoleService.ROLE_POWER_USER, 
                           FilePlanRoleService.ROLE_RECORDS_MANAGER,
-                          FilePlanRoleService.ROLE_SECURITY_OFFICER);         
-        }
+                          FilePlanRoleService.ROLE_SECURITY_OFFICER);     
+            addCapability(filePlan,
+                          "LinkToRecords", 
+                          FilePlanRoleService.ROLE_ADMIN, 
+                          FilePlanRoleService.ROLE_POWER_USER, 
+                          FilePlanRoleService.ROLE_RECORDS_MANAGER,
+                          FilePlanRoleService.ROLE_SECURITY_OFFICER);    
+}
     }   
     
     /**