diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
index bfe78ec87b..2688b3c450 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
@@ -3,7 +3,7 @@
 
 <beans>
    <!--  Assignable Capabilities -->
-   
+
    <!--  Cut off -->
    <bean id="rmApproveRecordsScheduledForCutoffCapability"
       parent="declarativeCapability">
@@ -82,7 +82,7 @@
    <bean id="rmDestroyRecordsCapability"
       parent="declarativeCapability">
       <property name="name" value="DestroyRecords"/>
-      <property name="permission" value="DestroyRecords"/>      
+      <property name="permission" value="DestroyRecords"/>
       <property name="private" value="true"/>
       <property name="conditions">
          <map>
@@ -137,6 +137,26 @@
       <property name="index" value="110" />
    </bean>
 
+   <!--  file transfer report capability -->
+   <bean id="rmFileTransferReportCapability"
+         parent="declarativeCapability">
+      <property name="name" value="FileTransferReport" />
+      <property name="permission" value="FileTransferReport" />
+      <property name="kinds">
+         <list>
+            <value>TRANSFER</value>
+         </list>
+      </property>
+      <property name="conditions">
+         <map>
+            <entry key="capabilityCondition.filling" value="true"/>
+            <entry key="capabilityCondition.frozen" value="false"/>
+         </map>
+      </property>
+      <property name="group"><ref bean="dispositionAndTransfersGroup"/></property>
+      <property name="index" value="120" />
+   </bean>
+
    <!--  Non-assignable Capabilities -->
 
    <bean id="rmInitiateAllTransfersCapability"
@@ -265,7 +285,7 @@
          </list>
       </property>
    </bean>
-   
+
    <!--  End Rentention -->
    <bean id="rmEndRetentionCapability"
       parent="declarativeCapability">
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 38f3346254..52817f04cc 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
@@ -54,6 +54,8 @@ capability.DestroyRecordsScheduledForDestruction.title=Destroy Records Scheduled
 capability.DestroyRecords.title=Destroy Records
 capability.DeleteRecords.title=Delete Records
 capability.TriggerAnEvent.title=Trigger An Event
+capability.FileDestructionReport.title=File Destruction Report
+capability.FileTransferReport.title=File Transfer Report
 
 # Hold Controls
 capability.group.holdControls.title=Hold Controls
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 1f8807b4ce..d8837a25e7 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
@@ -3,17 +3,17 @@
 <!-- PUBLIC '-//ALFRECSO//DTD PERMISSIONS//EN' 'permissionSchema.dtd' -->
 
 <permissions>
-    
+
     <!-- Namespaces used in type references -->
-    
+
     <namespaces>
         <namespace uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
         <namespace uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
         <namespace uri="http://www.alfresco.org/model/recordsmanagement/1.0" prefix="rma"/>
     </namespaces>
-    
+
     <permissionSet expose="selected" type="rma:filePlanComponent">
-        
+
         <!-- An RM administrator does not have admin rights to the full DM repo -->
         <!-- On no account should allowFullControl="true" be set here -->
         <!-- In addition, the admin role is editable and may not have all permissions - as defined -->
@@ -78,7 +78,7 @@
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="MapClassificationGuideMetadata"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="ManageAccessControls"/>
             <!-- Administrator has filing rights to all records - no other role does -->
-            <includePermissionGroup type="rma:filePlanComponent" permissionGroup="Filing"/>            
+            <includePermissionGroup type="rma:filePlanComponent" permissionGroup="Filing"/>
             <!--  Since V2.1 -->
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="CreateRecords"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="ManageRules"/>
@@ -87,16 +87,18 @@
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="FileUnfiledRecords"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="RejectRecords"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="LinkToRecords"/>
+            <!-- Since V2.2 -->
+            <includePermissionGroup type="rma:filePlanComponent" permissionGroup="FileTransferReport"/>
         </permissionGroup>
-        
+
         <permissionGroup name="Filing" allowFullControl="false" expose="true">
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="ReadRecords"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="FileRecords"/>
         </permissionGroup>
-        
+
         <permissionGroup name="ReadRecords" expose="false" allowFullControl="false"/>
         <permissionGroup name="FileRecords" expose="false" allowFullControl="false"/>
-        
+
         <permissionGroup name="DeclareRecords" expose="false" allowFullControl="false"/>
         <permissionGroup name="ViewRecords" expose="false" allowFullControl="false"/>
         <permissionGroup name="CreateModifyDestroyFolders" expose="false" allowFullControl="false"/>
@@ -156,9 +158,9 @@
         <permissionGroup name="UpdateExemptionCategories" expose="false" allowFullControl="false"/>
         <permissionGroup name="MapClassificationGuideMetadata" expose="false" allowFullControl="false"/>
         <permissionGroup name="ManageAccessControls" expose="false" allowFullControl="false"/>
-        
+
         <!--  Added since V2.1 -->
-        
+
         <permissionGroup name="CreateRecords" expose="false" allowFullControl="false"/>
         <permissionGroup name="ManageRules" expose="false" allowFullControl="false"/>
         <permissionGroup name="RequestRecordInformation" expose="false" allowFullControl="false"/>
@@ -166,279 +168,286 @@
         <permissionGroup name="RejectRecords" expose="false" allowFullControl="false"/>
         <permissionGroup name="FileUnfiledRecords" expose="false" allowFullControl="false"/>
         <permissionGroup name="LinkToRecords" expose="false" allowFullControl="false"/>
-        
+
+        <!--  Added since V2.2 -->
+        <permissionGroup name="FileTransferReport" expose="false" allowFullControl="false"/>
+
         <!--  End -->
-        
+
         <permission name="_ReadRecords" expose="false">
             <grantedToGroup permissionGroup="ReadRecords"/>
         </permission>
-        
+
          <permission name="_FileRecords" expose="false">
             <grantedToGroup permissionGroup="FileRecords"/>
         </permission>
-        
+
         <permission name="_DeclareRecords" expose="false">
             <grantedToGroup permissionGroup="DeclareRecords"/>
         </permission>
-        
+
         <permission name="_ViewRecords" expose="false">
             <grantedToGroup permissionGroup="ViewRecords"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyFolders" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyFolders"/>
         </permission>
-        
+
         <permission name="_EditRecordMetadata" expose="false">
             <grantedToGroup permissionGroup="EditRecordMetadata"/>
         </permission>
-        
+
         <permission name="_EditNonRecordMetadata" expose="false">
             <grantedToGroup permissionGroup="EditNonRecordMetadata"/>
         </permission>
-        
+
         <permission name="_AddModifyEventDates" expose="false">
             <grantedToGroup permissionGroup="AddModifyEventDates"/>
         </permission>
-        
+
         <permission name="_CloseFolders" expose="false">
             <grantedToGroup permissionGroup="CloseFolders"/>
         </permission>
-        
+
         <permission name="_DeclareRecordsInClosedFolders" expose="false">
             <grantedToGroup permissionGroup="DeclareRecordsInClosedFolders"/>
         </permission>
-        
+
         <permission name="_ReOpenFolders" expose="false">
             <grantedToGroup permissionGroup="ReOpenFolders"/>
         </permission>
-        
+
         <permission name="_CycleVitalRecords" expose="false">
             <grantedToGroup permissionGroup="CycleVitalRecords"/>
         </permission>
-        
+
         <permission name="_PlanningReviewCycles" expose="false">
             <grantedToGroup permissionGroup="PlanningReviewCycles"/>
         </permission>
-        
+
         <permission name="_UpdateTriggerDates" expose="false">
             <grantedToGroup permissionGroup="UpdateTriggerDates"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyEvents" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyEvents"/>
         </permission>
-        
+
         <permission name="_ManageAccessRights" expose="false">
             <grantedToGroup permissionGroup="ManageAccessRights"/>
         </permission>
-        
+
         <permission name="_MoveRecords" expose="false">
             <grantedToGroup permissionGroup="MoveRecords"/>
         </permission>
-        
+
         <permission name="_ChangeOrDeleteReferences" expose="false">
             <grantedToGroup permissionGroup="ChangeOrDeleteReferences"/>
         </permission>
-        
+
         <permission name="_DeleteLinks" expose="false">
             <grantedToGroup permissionGroup="DeleteLinks"/>
         </permission>
-        
+
         <permission name="_EditDeclaredRecordMetadata" expose="false">
             <grantedToGroup permissionGroup="EditDeclaredRecordMetadata"/>
         </permission>
-        
+
         <permission name="_ManuallyChangeDispositionDates" expose="false">
             <grantedToGroup permissionGroup="ManuallyChangeDispositionDates"/>
         </permission>
-        
+
         <permission name="_ApproveRecordsScheduledForCutoff" expose="false">
             <grantedToGroup permissionGroup="ApproveRecordsScheduledForCutoff"/>
         </permission>
-        
+
         <permission name="_CreateModifyRecordsInCutoffFolders" expose="false">
             <grantedToGroup permissionGroup="CreateModifyRecordsInCutoffFolders"/>
         </permission>
-        
+
         <permission name="_ExtendRetentionPeriodOrFreeze" expose="false">
             <grantedToGroup permissionGroup="ExtendRetentionPeriodOrFreeze"/>
         </permission>
-        
+
         <permission name="_Unfreeze" expose="false">
             <grantedToGroup permissionGroup="Unfreeze"/>
         </permission>
-        
+
         <permission name="_ViewUpdateReasonsForFreeze" expose="false">
             <grantedToGroup permissionGroup="ViewUpdateReasonsForFreeze"/>
         </permission>
-        
+
         <permission name="_DestroyRecordsScheduledForDestruction" expose="false">
             <grantedToGroup permissionGroup="DestroyRecordsScheduledForDestruction"/>
         </permission>
-        
+
         <permission name="_DestroyRecords" expose="false">
             <grantedToGroup permissionGroup="DestroyRecords"/>
         </permission>
-        
+
         <permission name="_UpdateVitalRecordCycleInformation" expose="false">
             <grantedToGroup permissionGroup="UpdateVitalRecordCycleInformation"/>
         </permission>
-        
+
         <permission name="_UndeclareRecords" expose="false">
             <grantedToGroup permissionGroup="UndeclareRecords"/>
         </permission>
-        
+
         <permission name="_DeclareAuditAsRecord" expose="false">
             <grantedToGroup permissionGroup="DeclareAuditAsRecord"/>
         </permission>
-        
+
         <permission name="_DeleteAudit" expose="false">
             <grantedToGroup permissionGroup="DeleteAudit"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyTimeframes" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyTimeframes"/>
         </permission>
-        
+
         <permission name="_AuthorizeNominatedTransfers" expose="false">
             <grantedToGroup permissionGroup="AuthorizeNominatedTransfers"/>
         </permission>
-        
+
         <permission name="_EditSelectionLists" expose="false">
             <grantedToGroup permissionGroup="EditSelectionLists"/>
         </permission>
-        
+
         <permission name="_AuthorizeAllTransfers" expose="false">
             <grantedToGroup permissionGroup="AuthorizeAllTransfers"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyFileplanMetadata" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyFileplanMetadata"/>
         </permission>
-        
+
         <permission name="_CreateAndAssociateSelectionLists" expose="false">
             <grantedToGroup permissionGroup="CreateAndAssociateSelectionLists"/>
         </permission>
-        
+
         <permission name="_AttachRulesToMetadataProperties" expose="false">
             <grantedToGroup permissionGroup="AttachRulesToMetadataProperties"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyFileplanTypes" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyFileplanTypes"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyRecordTypes" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyRecordTypes"/>
         </permission>
-        
+
         <permission name="_MakeOptionalParametersMandatory" expose="false">
             <grantedToGroup permissionGroup="MakeOptionalParametersMandatory"/>
         </permission>
-        
+
         <permission name="_MapEmailMetadata" expose="false">
             <grantedToGroup permissionGroup="MapEmailMetadata"/>
         </permission>
-        
+
         <permission name="_DeleteRecords" expose="false">
             <grantedToGroup permissionGroup="DeleteRecords"/>
         </permission>
-        
+
         <permission name="_TriggerAnEvent" expose="false">
             <grantedToGroup permissionGroup="TriggerAnEvent"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyRoles" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyRoles"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyUsersAndGroups" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyUsersAndGroups"/>
         </permission>
-        
+
         <permission name="_PasswordControl" expose="false">
             <grantedToGroup permissionGroup="PasswordControl"/>
         </permission>
-        
+
         <permission name="_EnableDisableAuditByTypes" expose="false">
             <grantedToGroup permissionGroup="EnableDisableAuditByTypes"/>
         </permission>
-        
+
         <permission name="_SelectAuditMetadata" expose="false">
             <grantedToGroup permissionGroup="SelectAuditMetadata"/>
         </permission>
-        
+
         <permission name="_DisplayRightsReport" expose="false">
             <grantedToGroup permissionGroup="DisplayRightsReport"/>
         </permission>
-        
+
         <permission name="_AccessAudit" expose="false">
             <grantedToGroup permissionGroup="AccessAudit"/>
         </permission>
-        
+
         <permission name="_ExportAudit" expose="false">
             <grantedToGroup permissionGroup="ExportAudit"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyReferenceTypes" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyReferenceTypes"/>
         </permission>
-        
+
         <permission name="_UpdateClassificationDates" expose="false">
             <grantedToGroup permissionGroup="UpdateClassificationDates"/>
         </permission>
-        
+
         <permission name="_CreateModifyDestroyClassificationGuides" expose="false">
             <grantedToGroup permissionGroup="CreateModifyDestroyClassificationGuides"/>
         </permission>
-        
+
         <permission name="_UpgradeDowngradeAndDeclassifyRecords" expose="false">
             <grantedToGroup permissionGroup="UpgradeDowngradeAndDeclassifyRecords"/>
         </permission>
-        
+
         <permission name="_UpdateExemptionCategories" expose="false">
             <grantedToGroup permissionGroup="UpdateExemptionCategories"/>
         </permission>
-        
+
         <permission name="_MapClassificationGuideMetadata" expose="false">
             <grantedToGroup permissionGroup="MapClassificationGuideMetadata"/>
         </permission>
-        
+
         <permission name="_ManageAccessControls" expose="false">
             <grantedToGroup permissionGroup="ManageAccessControls"/>
         </permission>
-        
+
         <!--  Added since V2.1 -->
-        
+
         <permission name="_CreateRecords" expose="false">
             <grantedToGroup permissionGroup="CreateRecords"/>
         </permission>
-        
+
         <permission name="_ManageRules" expose="false">
             <grantedToGroup permissionGroup="ManageRules"/>
         </permission>
-        
+
         <permission name="_RequestRecordInformation" expose="false">
             <grantedToGroup permissionGroup="RequestRecordInformation"/>
         </permission>
-        
+
         <permission name="_FileDestructionReport" expose="false">
             <grantedToGroup permissionGroup="FileDestructionReport"/>
         </permission>
-        
+
+        <permission name="_FileTransferReport" expose="false">
+            <grantedToGroup permissionGroup="FileTransferReport"/>
+        </permission>
+
         <permission name="_FileUnfiledRecords" expose="false">
             <grantedToGroup permissionGroup="FileUnfiledRecords"/>
         </permission>
-        
+
         <permission name="_RejectRecords" expose="false">
             <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/rm-patch-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
index 89748b746c..e64be41bde 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
@@ -3,198 +3,219 @@
 
 <beans>
 
+   <!-- Base bean definitions -->
+
    <bean id="rm.baseModulePatch" abstract="true" parent="module.baseComponent">
       <property name="retryingTransactionHelper" ref="retryingTransactionHelper"/>
       <property name="behaviourFilter" ref="policyBehaviourFilter" />
    </bean>
 
+   <bean id="rm.baseCapabilityPatch" abstract="true" parent="rm.baseModulePatch">
+      <property name="filePlanService" ref="FilePlanService"/>
+      <property name="filePlanRoleService" ref="FilePlanRoleService"/>
+      <property name="capabilityService" ref="CapabilityService"/>
+   </bean>
+
+   <!-- RM v2.0 Patches -->
+
    <bean id="org_alfresco_module_rm_notificationTemplatePatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.NotificationTemplatePatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_notificationTemplatePatch"/>
-       <property name="description" value="Patches new versions of the notification templates."/>
-       <property name="sinceVersion" value="2.0"/>
-       <property name="appliesFromVersion" value="2.0"/>
-       <property name="nodeService" ref="NodeService"/>
-       <property name="notificationHelper" ref="recordsManagementNotificationHelper"/>
-       <property name="contentService" ref="ContentService"/>
-       <property name="versionService" ref="VersionService"/>
-       <property name="auditService" ref="AuditService"/>
-   </bean>
-
-   <bean id="org_alfresco_module_rm_notificationTemplatePatch_v21"
-         parent="rm.baseModulePatch"
-         class="org.alfresco.module.org_alfresco_module_rm.patch.NotificationTemplatePatch_v21">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_notificationTemplatePatch_v21"/>
-       <property name="description" value="Patches new versions of the notification templates."/>
-       <property name="sinceVersion" value="2.1"/>
-       <property name="appliesFromVersion" value="2.1"/>
-       <property name="dependsOn">
-          <list>
-             <ref bean="org_alfresco_module_rm_bootstrapData" />
-          </list>
-       </property>
-       <property name="nodeService" ref="NodeService"/>
-       <property name="notificationHelper" ref="recordsManagementNotificationHelper"/>
-       <property name="contentService" ref="ContentService"/>
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_notificationTemplatePatch"/>
+      <property name="description" value="Patches new versions of the notification templates."/>
+      <property name="sinceVersion" value="2.0"/>
+      <property name="appliesFromVersion" value="2.0"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="notificationHelper" ref="recordsManagementNotificationHelper"/>
+      <property name="contentService" ref="ContentService"/>
+      <property name="versionService" ref="VersionService"/>
+      <property name="auditService" ref="AuditService"/>
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv2ModelPatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv2ModelPatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv2ModelPatch"/>
-       <property name="description" value="Patches the existing RM data for the RM v2.0 model updates."/>
-       <property name="sinceVersion" value="2.0"/>
-       <property name="appliesFromVersion" value="2.0"/>
-       <property name="patchDAO" ref="patchDAO"/>
-       <property name="nodeDAO" ref="nodeDAO" />
-       <property name="qnameDAO" ref="qnameDAO"/>
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv2ModelPatch"/>
+      <property name="description" value="Patches the existing RM data for the RM v2.0 model updates."/>
+      <property name="sinceVersion" value="2.0"/>
+      <property name="appliesFromVersion" value="2.0"/>
+      <property name="patchDAO" ref="patchDAO"/>
+      <property name="nodeDAO" ref="nodeDAO" />
+      <property name="qnameDAO" ref="qnameDAO"/>
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv2FilePlanNodeRefPatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv2FilePlanNodeRefPatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv2FilePlanNodeRefPatch"/>
-       <property name="description" value="Patches the existing RM data with the root file plan values."/>
-       <property name="sinceVersion" value="2.0"/>
-       <property name="appliesFromVersion" value="2.0"/>
-       <property name="patchDAO" ref="patchDAO"/>
-       <property name="nodeDAO" ref="nodeDAO" />
-       <property name="qnameDAO" ref="qnameDAO"/>
-       <property name="nodeService" ref="NodeService"/>
-       <property name="permissionService" ref="PermissionService"/>
-       <property name="filePlanService" ref="FilePlanService" />
-       <property name="filePlanRoleService" ref="filePlanRoleService" />
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv2FilePlanNodeRefPatch"/>
+      <property name="description" value="Patches the existing RM data with the root file plan values."/>
+      <property name="sinceVersion" value="2.0"/>
+      <property name="appliesFromVersion" value="2.0"/>
+      <property name="patchDAO" ref="patchDAO"/>
+      <property name="nodeDAO" ref="nodeDAO" />
+      <property name="qnameDAO" ref="qnameDAO"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="permissionService" ref="PermissionService"/>
+      <property name="filePlanService" ref="FilePlanService" />
+      <property name="filePlanRoleService" ref="filePlanRoleService" />
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv2SavedSearchPatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv2SavedSearchPatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv2SavedSearchPatch"/>
-       <property name="description" value="Patches the existing saved seaches."/>
-       <property name="sinceVersion" value="2.0"/>
-       <property name="appliesFromVersion" value="2.0"/>
-       <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
-       <property name="siteService" ref="SiteService" />
-       <property name="contentService" ref="ContentService"/>
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv2SavedSearchPatch"/>
+      <property name="description" value="Patches the existing saved seaches."/>
+      <property name="sinceVersion" value="2.0"/>
+      <property name="appliesFromVersion" value="2.0"/>
+      <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
+      <property name="siteService" ref="SiteService" />
+      <property name="contentService" ref="ContentService"/>
+   </bean>
+
+   <!-- RM v2.1 Patches -->
+
+   <bean id="org_alfresco_module_rm_notificationTemplatePatch_v21"
+         parent="rm.baseModulePatch"
+         class="org.alfresco.module.org_alfresco_module_rm.patch.NotificationTemplatePatch_v21">
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_notificationTemplatePatch_v21"/>
+      <property name="description" value="Patches new versions of the notification templates."/>
+      <property name="sinceVersion" value="2.1"/>
+      <property name="appliesFromVersion" value="2.1"/>
+      <property name="dependsOn">
+         <list>
+            <ref bean="org_alfresco_module_rm_bootstrapData" />
+         </list>
+      </property>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="notificationHelper" ref="recordsManagementNotificationHelper"/>
+      <property name="contentService" ref="ContentService"/>
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv21InPlacePatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv21InPlacePatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv21InPlacePatch"/>
-       <property name="description" value="Patches the existing RM data for the RM v2.1 InPlace features."/>
-       <property name="sinceVersion" value="2.1"/>
-       <property name="appliesFromVersion" value="2.1"/>
-	   <property name="filePlanRoleService" ref="FilePlanRoleService"/>
-       <property name="filePlanPermissionService" ref="FilePlanPermissionService"/>
-       <property name="filePlanService" ref="FilePlanService"/>
-       <property name="capabilityService" ref="CapabilityService"/>
-       <property name="ruleService" ref="RuleService" />
-       <property name="nodeService" ref="NodeService" />
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv21InPlacePatch"/>
+      <property name="description" value="Patches the existing RM data for the RM v2.1 InPlace features."/>
+      <property name="sinceVersion" value="2.1"/>
+      <property name="appliesFromVersion" value="2.1"/>
+      <property name="filePlanRoleService" ref="FilePlanRoleService"/>
+      <property name="filePlanPermissionService" ref="FilePlanPermissionService"/>
+      <property name="filePlanService" ref="FilePlanService"/>
+      <property name="capabilityService" ref="CapabilityService"/>
+      <property name="ruleService" ref="RuleService" />
+      <property name="nodeService" ref="NodeService" />
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv21CapabilityPatch"
-         parent="rm.baseModulePatch"
+         parent="rm.baseCapabilityPatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv21CapabilityPatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv21CapabilityPatch"/>
-       <property name="description" value="Patches the existing RM data for the RM v2.1 updated capabilities."/>
-       <property name="sinceVersion" value="2.1"/>
-       <property name="appliesFromVersion" value="2.1"/>
-       <property name="filePlanService" ref="FilePlanService"/>
-       <property name="filePlanRoleService" ref="FilePlanRoleService"/>
-       <property name="capabilityService" ref="CapabilityService"/>
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv21CapabilityPatch"/>
+      <property name="description" value="Patches the existing RM data for the RM v2.1 updated capabilities."/>
+      <property name="sinceVersion" value="2.1"/>
+      <property name="appliesFromVersion" value="2.1"/>
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv2RMAdminUserPatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv2RMAdminUserPatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv2RMAdminUserPatch"/>
-       <property name="description" value="Adds the global RM admin user to all existing file plans."/>
-       <property name="sinceVersion" value="2.1"/>
-       <property name="appliesFromVersion" value="2.1"/>
-       <property name="filePlanService" ref="FilePlanService"/>
-       <property name="filePlanRoleService" ref="FilePlanRoleService"/>
-       <property name="authenticationService" ref="AuthenticationService" />
-       <property name="personService" ref="PersonService" />
-       <property name="filePlanAuthenticationService" ref="FilePlanAuthenticationService" />
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv2RMAdminUserPatch"/>
+      <property name="description" value="Adds the global RM admin user to all existing file plans."/>
+      <property name="sinceVersion" value="2.1"/>
+      <property name="appliesFromVersion" value="2.1"/>
+      <property name="filePlanService" ref="FilePlanService"/>
+      <property name="filePlanRoleService" ref="FilePlanRoleService"/>
+      <property name="authenticationService" ref="AuthenticationService" />
+      <property name="personService" ref="PersonService" />
+      <property name="filePlanAuthenticationService" ref="FilePlanAuthenticationService" />
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv21RecordInheritancePatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv21RecordInheritancePatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv21RecordInheritancePatch"/>
-       <property name="description" value="Adjust record permission inheritance."/>
-       <property name="sinceVersion" value="2.1"/>
-       <property name="appliesFromVersion" value="2.1"/>
-       <property name="patchDAO" ref="patchDAO"/>
-       <property name="nodeDAO" ref="nodeDAO" />
-       <property name="qnameDAO" ref="qnameDAO"/>
-       <property name="nodeService" ref="nodeService"/>
-       <property name="filePlanPermissionServiceImpl" ref="filePlanPermissionService"/>
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv21RecordInheritancePatch"/>
+      <property name="description" value="Adjust record permission inheritance."/>
+      <property name="sinceVersion" value="2.1"/>
+      <property name="appliesFromVersion" value="2.1"/>
+      <property name="patchDAO" ref="patchDAO"/>
+      <property name="nodeDAO" ref="nodeDAO" />
+      <property name="qnameDAO" ref="qnameDAO"/>
+      <property name="nodeService" ref="nodeService"/>
+      <property name="filePlanPermissionServiceImpl" ref="filePlanPermissionService"/>
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv21RolesPatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv21RolesPatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv21RolesPatch"/>
-       <property name="description" value="Add existing roles to the rm zone."/>
-       <property name="sinceVersion" value="2.1"/>
-       <property name="appliesFromVersion" value="2.1"/>
-       <property name="filePlanService" ref="FilePlanService"/>
-       <property name="filePlanRoleService" ref="FilePlanRoleService"/>
-       <property name="authorityService" ref="AuthorityService"></property>
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv21RolesPatch"/>
+      <property name="description" value="Add existing roles to the rm zone."/>
+      <property name="sinceVersion" value="2.1"/>
+      <property name="appliesFromVersion" value="2.1"/>
+      <property name="filePlanService" ref="FilePlanService"/>
+      <property name="filePlanRoleService" ref="FilePlanRoleService"/>
+      <property name="authorityService" ref="AuthorityService"></property>
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv21ReportServicePatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv21ReportServicePatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv21ReportServicePatch"/>
-       <property name="description" value="Add report service templates."/>
-       <property name="sinceVersion" value="2.1"/>
-       <property name="appliesFromVersion" value="2.1"/>
-	   <property name="contentService" ref="ContentService" />
-	   <property name="nodeService" ref="NodeService" />
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv21ReportServicePatch"/>
+      <property name="description" value="Add report service templates."/>
+      <property name="sinceVersion" value="2.1"/>
+      <property name="appliesFromVersion" value="2.1"/>
+      <property name="contentService" ref="ContentService" />
+      <property name="nodeService" ref="NodeService" />
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv21BehaviorScriptsPatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv21BehaviorScriptsPatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv21BehaviorScriptsPatch"/>
-       <property name="description" value="Move existing behavior scripts to their dedicated behavior folder, freeing existing scripts folder up for non-behavior RM scripts."/>
-       <property name="sinceVersion" value="2.1"/>
-       <property name="appliesFromVersion" value="2.1"/>
-       <property name="fileFolderService" ref="FileFolderService"/>
-       <property name="nodeService" ref="NodeService"/>
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv21BehaviorScriptsPatch"/>
+      <property name="description" value="Move existing behavior scripts to their dedicated behavior folder, freeing existing scripts folder up for non-behavior RM scripts."/>
+      <property name="sinceVersion" value="2.1"/>
+      <property name="appliesFromVersion" value="2.1"/>
+      <property name="fileFolderService" ref="FileFolderService"/>
+      <property name="nodeService" ref="NodeService"/>
    </bean>
 
+   <!-- RM v2.2 Patches -->
+
    <bean id="org_alfresco_module_rm_RMv22ReportTemplatePatch"
          parent="rm.baseModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.RMv22ReportTemplatePatch">
-       <property name="moduleId" value="org_alfresco_module_rm"/>
-       <property name="name" value="org_alfresco_module_rm_RMv22ReportTemplatePatch"/>
-       <property name="description" value="Patches new versions of the report templates."/>
-       <property name="sinceVersion" value="2.2"/>
-       <property name="appliesFromVersion" value="2.2"/>
-       <property name="dependsOn">
-          <list>
-             <ref bean="org_alfresco_module_rm_RMv21ReportServicePatch" />
-          </list>
-       </property>
-       <property name="nodeService" ref="NodeService"/>
-       <property name="contentService" ref="ContentService"/>
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv22ReportTemplatePatch"/>
+      <property name="description" value="Patches new versions of the report templates."/>
+      <property name="sinceVersion" value="2.2"/>
+      <property name="appliesFromVersion" value="2.2"/>
+      <property name="dependsOn">
+         <list>
+            <ref bean="org_alfresco_module_rm_RMv21ReportServicePatch" />
+         </list>
+      </property>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="contentService" ref="ContentService"/>
+   </bean>
+
+   <bean id="org_alfresco_module_rm_RMv22CapabilityPatch"
+         parent="rm.baseCapabilityPatch"
+         class="org.alfresco.module.org_alfresco_module_rm.patch.RMv22CapabilityPatch">
+      <property name="moduleId" value="org_alfresco_module_rm"/>
+      <property name="name" value="org_alfresco_module_rm_RMv22CapabilityPatch"/>
+      <property name="description" value="Patches the existing RM data for the RM v2.2 updated capabilities."/>
+      <property name="sinceVersion" value="2.2"/>
+      <property name="appliesFromVersion" value="2.2"/>
    </bean>
 
 </beans>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-report-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-report-context.xml
index d2aa0758e6..1ccdc2d8ad 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-report-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-report-context.xml
@@ -115,8 +115,7 @@
    <bean id="transferReport_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor" parent="actionSecurity">
       <property name="objectDefinitionSource">
          <value>
-            <!-- FIXME: Which capability do we need to check? -->
-            org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.execute=RM_ALLOW
+            org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.execute=RM_CAP.0.rma:filePlanComponent.FileTransferReport
             org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.*=RM_ALLOW
             org.alfresco.repo.action.executer.ActionExecuter.*=RM_ALLOW
          </value>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index fbec50a811..e93bccb8e6 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -426,6 +426,17 @@
       <property name="capability" value ="FileDestructionReport"/>
    </bean>
 
+   <bean id="jsonConversionComponent.fileTransferReportAction"
+         parent="jsonConversionComponent.baseAction">
+      <property name="name" value="fileTransferReport"/>
+      <property name="kinds">
+         <set>
+            <value>TRANSFER</value>
+         </set>
+      </property>
+      <property name="capability" value ="FileTransferReport"/>
+   </bean>
+
    <bean id="jsonConversionComponent.transferAction"
          parent="jsonConversionComponent.baseAction">
       <property name="name" value="transfer"/>
@@ -613,11 +624,6 @@
       <property name="name" value="downloadZip"/>
    </bean>
 
-   <bean id="jsonConversionComponent.fileReport"
-         parent="jsonConversionComponent.baseAction">
-      <property name="name" value="fileReport"/>
-   </bean>
-
    <bean id="jsonConversionComponent.transferComplete"
          parent="jsonConversionComponent.baseAction">
       <property name="name" value="transferComplete"/>
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 1b35b40b58..63bdbfce25 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
@@ -83,7 +83,7 @@
       "capabilities" :
       [
           "DeclareRecords",
-          "ViewRecords",          
+          "ViewRecords",
           "CreateRecords",
           "CreateModifyDestroyFolders",
           "EditRecordMetadata",
@@ -137,13 +137,14 @@
           "FileDestructionReport",
           "FileUnfiledRecords",
           "RejectRecords",
-          "LinkToRecords"
+          "LinkToRecords",
+          "FileTransferReport"
       ]
    },
    {
       "name" : "Administrator",
       "displayLabel" : "rm.role.administrator",
-      "isAdmin" : true, 
+      "isAdmin" : true,
       "capabilities" :
       [
           "DeclareRecords",
@@ -203,7 +204,8 @@
           "FileDestructionReport",
           "FileUnfiledRecords",
           "RejectRecords",
-          "LinkToRecords"
+          "LinkToRecords",
+          "FileTransferReport"
       ]
    }
 ]
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/BaseRMCapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/BaseRMCapabilityPatch.java
new file mode 100644
index 0000000000..2f2263b7af
--- /dev/null
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/BaseRMCapabilityPatch.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.patch;
+
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
+import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
+import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
+import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
+import org.alfresco.module.org_alfresco_module_rm.role.Role;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * Base class for the capability patch classes
+ *
+ * @author Tuna Aksoy
+ * @since 2.2
+ */
+public abstract class BaseRMCapabilityPatch extends ModulePatchComponent
+{
+    /** File plan service */
+    private FilePlanService filePlanService;
+
+    /** File plan role service */
+    private FilePlanRoleService filePlanRoleService;
+
+    /** Capability service */
+    private CapabilityService capabilityService;
+
+    /**
+     * @param filePlanRoleService   file plan role service
+     */
+    public void setFilePlanRoleService(FilePlanRoleService filePlanRoleService)
+    {
+        this.filePlanRoleService = filePlanRoleService;
+    }
+
+    /**
+     * @param capabilityService capability service
+     */
+    public void setCapabilityService(CapabilityService capabilityService)
+    {
+        this.capabilityService = capabilityService;
+    }
+
+    /**
+     * @param filePlanService   file plan service
+     */
+    public void setFilePlanService(FilePlanService filePlanService)
+    {
+        this.filePlanService = filePlanService;
+    }
+
+    /**
+     * Helper method to get the file plans
+     *
+     * @return Set of file plan node references
+     */
+    protected Set<NodeRef> getFilePlans()
+    {
+        return filePlanService.getFilePlans();
+    }
+
+    /**
+     * Adds a new capability to the specified roles.
+     *
+     * @param filePlan          file plan
+     * @param capabilityName    capability name
+     * @param roles             roles
+     */
+    protected void addCapability(NodeRef filePlan, String capabilityName, String ... roles)
+    {
+        Capability capability = capabilityService.getCapability(capabilityName);
+        if (capability == null)
+        {
+            throw new AlfrescoRuntimeException("Unable to bootstrap RMv21 capabilities, because capability " + capabilityName + " does not exist.");
+        }
+
+        for (String roleName : roles)
+        {
+            Role role = filePlanRoleService.getRole(filePlan, roleName);
+
+            if (role != null)
+            {
+                // get the roles current capabilities
+                Set<Capability> capabilities = role.getCapabilities();
+
+                // only update if the capability is missing
+                if (capabilities.contains(capability) == false)
+                {
+                    if (logger.isDebugEnabled() == true)
+                    {
+                        logger.debug("  ... adding capability " + capabilityName + " to role " + role.getName());
+                    }
+
+                    capabilities.add(capability);
+                    filePlanRoleService.updateRole(filePlan, role.getName(), role.getDisplayLabel(), capabilities);
+                }
+            }
+        }
+    }
+}
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 f1875fd273..94d01534cf 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
@@ -20,156 +20,75 @@ package org.alfresco.module.org_alfresco_module_rm.patch;
 
 import java.util.Set;
 
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
-import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
-import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
-import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
-import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
-import org.alfresco.module.org_alfresco_module_rm.role.Role;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.springframework.beans.factory.BeanNameAware;
 
 /**
  * RM v2.1 patch to updated modified capabilities.
- * 
+ *
  * @author Roy Wetherall
  * @since 2.1
  */
-public class RMv21CapabilityPatch extends ModulePatchComponent 
-                                  implements BeanNameAware, RecordsManagementModel, DOD5015Model
-{    
-    /** file plan service */
-    private FilePlanService filePlanService;
-    
-    /** File plan role service */
-    private FilePlanRoleService filePlanRoleService;
-    
-    /** Capability service */
-    private CapabilityService capabilityService;
-    
-    /**
-     * @param filePlanService   file plan service
-     */
-    public void setFilePlanService(FilePlanService filePlanService)
-    {
-        this.filePlanService = filePlanService;
-    }
-
-    /**
-     * @param filePlanRoleService   file plan role service
-     */
-    public void setFilePlanRoleService(FilePlanRoleService filePlanRoleService)
-    {
-        this.filePlanRoleService = filePlanRoleService;
-    }
-    
-    /**
-     * @param capabilityService capability service
-     */
-    public void setCapabilityService(CapabilityService capabilityService)
-    {
-        this.capabilityService = capabilityService;
-    }
-    
+public class RMv21CapabilityPatch extends BaseRMCapabilityPatch
+{
     /**
      * @see org.alfresco.repo.module.AbstractModuleComponent#executeInternal()
      */
     @Override
     protected void executePatch() throws Throwable
     {
-        Set<NodeRef> filePlans = filePlanService.getFilePlans();
-        
+        Set<NodeRef> filePlans = getFilePlans();
+
         if (logger.isDebugEnabled() == true)
         {
             logger.debug("  ... updating " + filePlans.size() + " file plans");
         }
-        
+
         for (NodeRef filePlan : filePlans)
         {
             if (logger.isDebugEnabled() == true)
             {
                 logger.debug("  ... updating file plan " + filePlan.toString());
             }
-            
+
             // add new capabilities
-            addCapability(filePlan, 
-                          "CreateRecords", 
-                          FilePlanRoleService.ROLE_ADMIN, 
-                          FilePlanRoleService.ROLE_POWER_USER, 
+            addCapability(filePlan,
+                          "CreateRecords",
+                          FilePlanRoleService.ROLE_ADMIN,
+                          FilePlanRoleService.ROLE_POWER_USER,
                           FilePlanRoleService.ROLE_RECORDS_MANAGER,
                           FilePlanRoleService.ROLE_SECURITY_OFFICER);
             addCapability(filePlan,
                           "ManageRules",
                           FilePlanRoleService.ROLE_ADMIN);
             addCapability(filePlan,
-                          "RequestRecordInformation", 
-                          FilePlanRoleService.ROLE_ADMIN, 
-                          FilePlanRoleService.ROLE_POWER_USER, 
+                          "RequestRecordInformation",
+                          FilePlanRoleService.ROLE_ADMIN,
+                          FilePlanRoleService.ROLE_POWER_USER,
                           FilePlanRoleService.ROLE_RECORDS_MANAGER,
-                          FilePlanRoleService.ROLE_SECURITY_OFFICER);            
+                          FilePlanRoleService.ROLE_SECURITY_OFFICER);
             addCapability(filePlan,
-                          "FileDestructionReport", 
-                          FilePlanRoleService.ROLE_ADMIN, 
-                          FilePlanRoleService.ROLE_RECORDS_MANAGER); 
+                          "FileDestructionReport",
+                          FilePlanRoleService.ROLE_ADMIN,
+                          FilePlanRoleService.ROLE_RECORDS_MANAGER);
             addCapability(filePlan,
-                          "RejectRecords", 
-                          FilePlanRoleService.ROLE_ADMIN, 
-                          FilePlanRoleService.ROLE_POWER_USER, 
+                          "RejectRecords",
+                          FilePlanRoleService.ROLE_ADMIN,
+                          FilePlanRoleService.ROLE_POWER_USER,
                           FilePlanRoleService.ROLE_RECORDS_MANAGER,
-                          FilePlanRoleService.ROLE_SECURITY_OFFICER);    
+                          FilePlanRoleService.ROLE_SECURITY_OFFICER);
             addCapability(filePlan,
-                          "FileUnfiledRecords", 
-                          FilePlanRoleService.ROLE_ADMIN, 
-                          FilePlanRoleService.ROLE_POWER_USER, 
+                          "FileUnfiledRecords",
+                          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, 
+                          "LinkToRecords",
+                          FilePlanRoleService.ROLE_ADMIN,
+                          FilePlanRoleService.ROLE_POWER_USER,
                           FilePlanRoleService.ROLE_RECORDS_MANAGER,
-                          FilePlanRoleService.ROLE_SECURITY_OFFICER);    
-}
-    }   
-    
-    /**
-     * Adds a new capability to the specified roles.
-     * 
-     * @param filePlan          file plan
-     * @param capabilityName    capability name
-     * @param roles             roles
-     */
-    private void addCapability(NodeRef filePlan, String capabilityName, String ... roles)
-    {
-        Capability capability = capabilityService.getCapability(capabilityName);
-        if (capability == null)
-        {
-            throw new AlfrescoRuntimeException("Unable to bootstrap RMv21 capabilities, because capability " + capabilityName + " does not exist.");
+                          FilePlanRoleService.ROLE_SECURITY_OFFICER);
         }
-        
-        for (String roleName : roles)
-        {
-            Role role = filePlanRoleService.getRole(filePlan, roleName);
-            
-            if (role != null)
-            {
-                // get the roles current capabilities
-                Set<Capability> capabilities = role.getCapabilities();
-                
-                // only update if the capability is missing
-                if (capabilities.contains(capability) == false)
-                {                
-                    if (logger.isDebugEnabled() == true)
-                    {
-                        logger.debug("  ... adding capability " + capabilityName + " to role " + role.getName());
-                    }
-                    
-                    capabilities.add(capability);
-                    filePlanRoleService.updateRole(filePlan, role.getName(), role.getDisplayLabel(), capabilities);
-                }
-            }            
-        }
-    }    
+    }
 }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22CapabilityPatch.java
new file mode 100644
index 0000000000..b3316e92c1
--- /dev/null
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv22CapabilityPatch.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.patch;
+
+import java.util.Set;
+
+import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * RM v2.2 patch to updated modified capabilities.
+ *
+ * @author Tuna Aksoy
+ * @since 2.2
+ */
+public class RMv22CapabilityPatch extends BaseRMCapabilityPatch
+{
+    /**
+     * @see org.alfresco.repo.module.AbstractModuleComponent#executeInternal()
+     */
+    @Override
+    protected void executePatch() throws Throwable
+    {
+        Set<NodeRef> filePlans = getFilePlans();
+
+        if (logger.isDebugEnabled() == true)
+        {
+            logger.debug("  ... updating " + filePlans.size() + " file plans");
+        }
+
+        for (NodeRef filePlan : filePlans)
+        {
+            if (logger.isDebugEnabled() == true)
+            {
+                logger.debug("  ... updating file plan " + filePlan.toString());
+            }
+
+            // add new capability
+            addCapability(filePlan,
+                          "FileDestructionReport",
+                          FilePlanRoleService.ROLE_ADMIN,
+                          FilePlanRoleService.ROLE_RECORDS_MANAGER);
+        }
+    }
+}