diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
index 6c70ad4bf8..0f1015f7fa 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
@@ -158,7 +158,6 @@
       parent="declarativeCapability">
       <property name="name" value="FileUnfiledRecords"/>
       <property name="permission" value="FileUnfiledRecords"/>
-      <property name="kind" value="RECORD" />
       <property name="conditions">
          <map>
             <entry key="capabilityCondition.filling" value="true"/>  		<!--  Checks if the user has the filling capability -->
@@ -276,7 +275,6 @@
       <property name="kinds">
          <list>
             <value>RECORD</value>
-            <value>RECORD_FOLDER</value>
          </list>
       </property>
       <property name="conditions">
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
index 2420858b34..97f9aee406 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
@@ -62,6 +62,27 @@
       <property name="index" value="40" />
    </bean>
 
+   <bean id="rmFileVersionRecordsCapability"
+         parent="declarativeCapability">
+      <property name="name" value="FileVersionRecords" />
+      <property name="permission" value="FileVersionRecords" />
+      <property name="kinds">
+         <list>
+            <value>RECORD_FOLDER</value>
+         </list>
+      </property>
+      <property name="conditions">
+         <map>
+            <entry key="capabilityCondition.filling" value="true" />
+            <entry key="capabilityCondition.cutoff" value="false" />
+            <entry key="capabilityCondition.frozen" value="false" />
+            <entry key="capabilityCondition.closed" value="false" />
+         </map>
+      </property>
+      <property name="group"><ref bean="folderControlGroup" /></property>
+      <property name="index" value="50" />
+   </bean>
+
    <!--  Unassignable -->
 
    <bean id="rmCreateRecordFolderCapability"
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
index 97ab98883d..a19b8ec389 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
@@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=Create Modify Destroy Folders
 capability.CloseFolders.title=Close Folders
 capability.ReOpenFolders.title=Re-Open Folders
 capability.DeclareRecordsInClosedFolders.title=Complete Records in Closed Folders
+capability.FileVersionRecords.title=File Version Records
 
 # Vital Records
 capability.group.vitalRecords.title=Vital Records
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
index 9f9dc70b2e..9e748e4107 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml
@@ -28,6 +28,7 @@
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="CloseFolders"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="DeclareRecordsInClosedFolders"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="ReOpenFolders"/>
+            <includePermissionGroup type="rma:filePlanComponent" permissionGroup="FileVersionRecords" />
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="CycleVitalRecords"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="PlanningReviewCycles"/>
             <includePermissionGroup type="rma:filePlanComponent" permissionGroup="UpdateTriggerDates"/>
@@ -114,7 +115,8 @@
         <permissionGroup name="AddModifyEventDates" expose="false" allowFullControl="false"/>
         <permissionGroup name="CloseFolders" expose="false" allowFullControl="false"/>
         <permissionGroup name="DeclareRecordsInClosedFolders" expose="false" allowFullControl="false"/>
-        <permissionGroup name="ReOpenFolders" expose="false" allowFullControl="false"/>
+        <permissionGroup name="FileVersionRecords" expose="false" allowFullControl="false"/>
+        <permissionGroup name="ReOpenFolders" expose="false" allowFullControl="false" />
         <permissionGroup name="CycleVitalRecords" expose="false" allowFullControl="false"/>
         <permissionGroup name="PlanningReviewCycles" expose="false" allowFullControl="false"/>
         <permissionGroup name="UpdateTriggerDates" expose="false" allowFullControl="false"/>
@@ -232,6 +234,10 @@
             <grantedToGroup permissionGroup="ReOpenFolders"/>
         </permission>
 
+        <permission name="_FileVersionRecords" expose="false">
+           <grantedToGroup permissionGroup="FileVersionRecords" />
+        </permission>
+
         <permission name="_CycleVitalRecords" expose="false">
             <grantedToGroup permissionGroup="CycleVitalRecords"/>
         </permission>
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
index 5771b8d991..257f495b84 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
@@ -49,7 +49,8 @@
          "RequestRecordInformation",
          "FileUnfiledRecords",
          "RejectRecords",
-         "LinkToRecords"
+         "LinkToRecords",
+         "FileVersionRecords"
       ]
    },
    {
@@ -74,7 +75,8 @@
           "FileUnfiledRecords",
           "RejectRecords",
           "LinkToRecords",
-          "ManageAccessControls"
+          "ManageAccessControls",
+          "FileVersionRecords"
       ]
    },
    {
@@ -145,8 +147,8 @@
           "DeleteHold",
           "EndRetention",
           "EditHold",
-          "ManageAccessControls"
-
+          "ManageAccessControls",
+          "FileVersionRecords"
       ]
    },
    {
@@ -219,7 +221,8 @@
           "FileHoldReport",
           "DeleteHold",
           "EditHold",
-          "EndRetention"
+          "EndRetention",
+          "FileVersionRecords"
       ]
    }
 ]
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java
index 2a3fc4faf4..0b8dc76dd8 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java
@@ -74,7 +74,7 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac
     public static final String PARAM_FILE_PLAN = "file-plan";
     public static final String PARAM_PATH = "path";
 
-    private static final String EDIT_RECORD_METADATA_CAPABILITY = "EditRecordMetadata";
+    private static final String FILE_VERSION_RECORDS_CAPABILITY = "FileVersionRecords";
 
     /** Sync Model URI */
     private static final String SYNC_MODEL_1_0_URI = "http://www.alfresco.org/model/sync/1.0";
@@ -213,7 +213,7 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac
             // create record from latest version
             if (destinationRecordFolder != null)
             {
-                boolean hasCapability = capabilityService.hasCapability(destinationRecordFolder, EDIT_RECORD_METADATA_CAPABILITY);
+                boolean hasCapability = capabilityService.hasCapability(destinationRecordFolder, FILE_VERSION_RECORDS_CAPABILITY);
                 // validate destination record folder
                 if (hasCapability)
                 {