diff --git a/rm-server/build.gradle b/rm-server/build.gradle
index 8a5520e1f1..58e8f695ae 100644
--- a/rm-server/build.gradle
+++ b/rm-server/build.gradle
@@ -50,10 +50,12 @@ test {
   
   include '**/JSONConversionComponentTest.class'
   
+  include '**/RecordsManagementServiceImplTest.class'
   include '**/CustomEMailMappingServiceServiceImplTest.class'
   include '**/DispositionServiceImplTest.class'
   include '**/RecordsManagementActionServiceImplTest.class'
   include '**/RecordsManagementAdminServiceImplTest.class'
+  include '**/RecordsManagementSearchServiceImplTest.class'
   
   testLogging.showStandardStreams = true
 
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
index 4f651f07dc..3c8fc8f4e9 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
@@ -103,6 +103,13 @@
     	<property name="dispositionAction" value="accession"/>
     </bean>
     
+    <bean id="capabilityCondition.cutoffIsScheduled" 
+          parent="capabilityCondition.base"
+          class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.IsScheduledCapabilityCondition">
+    	<property name="dispositionService" ref="DispositionService"/>
+    	<property name="dispositionAction" value="cutoff"/>
+    </bean>
+    
     <bean id="capabilityCondition.isTransferAccession" 
           parent="capabilityCondition.base"
           class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.IsTransferAccessionCapabilityCondition">
@@ -120,5 +127,12 @@
           class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.HasDispositionDateCapabilityCondition">
        <property name="dispositionService" ref="DispositionService"/>
     </bean>
+    
+    <bean id="capabilityCondition.lastDispositionActionCutoff" 
+          parent="capabilityCondition.base"
+          class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.LastDispositionActionCondition">
+       <property name="dispositionService" ref="DispositionService"/>
+       <property name="dispositionActionName" value="cutoff"/>
+    </bean>
 
 </beans>
\ No newline at end of file
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 0236e1848f..abfd0ae413 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
@@ -105,7 +105,8 @@
    			<map>
    				<entry key="capabilityCondition.filling" value="true"/> 
    				<entry key="capabilityCondition.frozenOrFrozenChildren" value="false"/>   	
-   				<entry key="capabilityCondition.hasDispositionAsOfDate" value="true"/>
+   				<entry key="capabilityCondition.hasDispositionAsOfDate" value="true"/> 
+   				<entry key="capabilityCondition.isTransferring" value="false" />
    			</map>
    		</property>
     </bean>
@@ -173,5 +174,52 @@
    			</map>
    		</property>	  		
     </bean>
+    
+    <bean id="rmCutOffCapability" 
+    	  parent="compositeCapability">
+        <property name="name" value="CutOff"/> 		
+        <property name="private" value="true"/>	
+		<property name="kinds">
+			<list>
+				<value>RECORD_FOLDER</value>
+				<value>RECORD</value>
+			</list>
+		</property> 	
+    	<property name="capabilities">
+    		<list>
+    			<ref bean="rmApproveRecordsScheduledForCutoffCapability"/>        			    		
+    		</list>
+    	</property>		
+   		<property name="conditions">
+   			<map>
+   				<entry key="capabilityCondition.cutoff" value="false"/>
+   				<entry key="capabilityCondition.cutoffIsScheduled" value="true" />
+   			</map>
+   		</property>	
+    </bean>
+    
+    <bean id="rmUndoCutOffCapability" 
+    	  parent="compositeCapability">
+        <property name="name" value="UndoCutOff"/>
+        <property name="private" value="true"/>	  		
+		<property name="kinds">
+			<list>
+				<value>RECORD_FOLDER</value>
+				<value>RECORD</value>
+			</list>
+		</property>	
+    	<property name="capabilities">
+    		<list>
+    			<ref bean="rmApproveRecordsScheduledForCutoffCapability"/>        			    		
+    		</list>
+    	</property>		
+   		<property name="conditions">
+   			<map>
+   				<entry key="capabilityCondition.cutoff" value="true"/>
+   				<entry key="capabilityCondition.isTransferring" value="false" />
+   				<entry key="capabilityCondition.lastDispositionActionCutoff" value="true"/>
+   			</map>
+   		</property>	
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
index 6a96bc9641..a636762d31 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
@@ -128,7 +128,8 @@
    		<property name="conditions">
    			<map>
    				<entry key="capabilityCondition.filling" value="true"/>
-   				<entry key="capabilityCondition.frozenOrFrozenChildren" value="false"/>   				
+   				<entry key="capabilityCondition.frozenOrFrozenChildren" value="false"/>  
+   				<entry key="capabilityCondition.isTransferring" value="false" /> 				
    				<entry key="capabilityCondition.transferred" value="false"/>
    				<entry key="capabilityCondition.destroyed" value="false"/>
    				<entry key="capabilityCondition.vitalRecordOrFolder" value="true"/>
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 67d894400f..d451f291b6 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
@@ -362,7 +362,7 @@
 				<value>RECORD</value>
 			</set>
 		</property>	
-		<property name="capability" value ="ApproveRecordsScheduledForCutoff"/>
+		<property name="capability" value ="CutOff"/>
 	</bean>
 	
 	<bean id="jsonConversionComponent.destroyAction"
@@ -412,7 +412,7 @@
 				<value>RECORD</value>
 			</set>
 		</property>	
-		<property name="capability" value ="ApproveRecordsScheduledForCutoff"/>
+		<property name="capability" value ="UndoCutOff"/>
 	</bean>
 	
 	<bean id="jsonConversionComponent.editDispositionAsOfDateAction"