diff --git a/config/alfresco/ehcache-default.xml b/config/alfresco/ehcache-default.xml
index ba175cb324..a9e9b761e9 100644
--- a/config/alfresco/ehcache-default.xml
+++ b/config/alfresco/ehcache-default.xml
@@ -317,7 +317,7 @@
     
     <cache 
         name="org.alfresco.cache.webScriptsRegistryCache"
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
diff --git a/config/alfresco/ibatis/alfresco-SqlMapConfig.xml b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml
index 65045134b9..9d345edd3c 100644
--- a/config/alfresco/ibatis/alfresco-SqlMapConfig.xml
+++ b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml
@@ -170,6 +170,7 @@ Inbound settings from iBatis
     </typeHandlers>
         
     <mappers>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/alfresco-util-SqlMap.xml"/>
         <mapper resource="alfresco/ibatis/#resource.dialect#/appliedpatch-common-SqlMap.xml"/>
         <mapper resource="alfresco/ibatis/#resource.dialect#/audit-common-SqlMap.xml"/>
         <mapper resource="alfresco/ibatis/#resource.dialect#/audit-insert-SqlMap.xml"/>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/alfresco-util-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/alfresco-util-SqlMap.xml
new file mode 100644
index 0000000000..b3a54a424c
--- /dev/null
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/alfresco-util-SqlMap.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="alfresco.util">
+
+    <sql id="escape">
+        escape '\\'
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
index 65964bb2ce..f774adc86d 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
@@ -396,8 +396,8 @@
             join alf_qname qn on (qn.id = asp.qname_id)
             join alf_namespace ns on (ns.id = qn.ns_id)
         where
-            ns.uri like ? and
-            qn.local_name like ?
+            ns.uri like ? <include refid="alfresco.util.escape"/> and
+            qn.local_name like ? <include refid="alfresco.util.escape"/>
     </select>
     
     <select id="select_AVMStorePropertiesByKeyPatternL" parameterMap="parameter_KeyPattern" resultMap="result_AVMStoreProperty">
@@ -408,8 +408,8 @@
             join alf_qname qn on (qn.id = asp.qname_id)
             join alf_namespace ns on (ns.id = qn.ns_id)
         where
-            ns.uri like ? and
-            lower(qn.local_name) like lower(?)
+            ns.uri like ? <include refid="alfresco.util.escape"/> and
+            lower(qn.local_name) like lower(?) <include refid="alfresco.util.escape"/>
     </select>
     
     <select id="select_AVMStorePropertiesByStoreAndKeyPattern" parameterMap="parameter_IdAndKeyPattern" resultMap="result_AVMStoreProperty">
@@ -421,8 +421,8 @@
             join alf_namespace ns on (ns.id = qn.ns_id)
         where
             asp.avm_store_id = ? and
-            ns.uri like ? and
-            qn.local_name like ?
+            ns.uri like ? <include refid="alfresco.util.escape"/> and
+            qn.local_name like ? <include refid="alfresco.util.escape"/>
     </select>
     
     <select id="select_AVMStorePropertiesByStoreAndKeyPatternL" parameterMap="parameter_IdAndKeyPattern" resultMap="result_AVMStoreProperty">
@@ -434,8 +434,8 @@
             join alf_namespace ns on (ns.id = qn.ns_id)
         where
             asp.avm_store_id = ? and
-            ns.uri like ? and
-            lower(qn.local_name) like lower(?)
+            ns.uri like ? <include refid="alfresco.util.escape"/> and
+            lower(qn.local_name) like lower(?) <include refid="alfresco.util.escape"/>
     </select>
     
     <!-- Optimistic update of the store property -->
@@ -964,7 +964,7 @@
             avm_child_entries
         where
             parent_id = ? and
-            name like ?
+            name like ? <include refid="alfresco.util.escape"/>
     </select>
     
     <select id="select_AVMNodeChildEntriesByParentAndNamePatternL" parameterMap="parameter_IdPatternMap" resultMap="result_AVMChildEntry">
@@ -974,7 +974,7 @@
             avm_child_entries
         where
             parent_id = ? and
-            lower(name) like lower(?)
+            lower(name) like lower(?) <include refid="alfresco.util.escape"/>
     </select>
     
     <!-- Get AVMNodeChildEntries by child node ID -->
@@ -1246,7 +1246,7 @@
                 value2_prop_id = ? and
                 value3_prop_id = pv3.id and
                 pv3.persisted_type = 3 and
-                psv3.string_value like ? and
+                psv3.string_value like ? <include refid="alfresco.util.escape"/> and
                 prop1_id = pl.root_prop_id and
                 psvk.string_value = ? and
                 psvv.string_value = ?
@@ -1268,7 +1268,7 @@
                 value2_prop_id = ? and
                 value3_prop_id = pv3.id and
                 pv3.persisted_type = 3 and
-                psv3.string_value like ?
+                psv3.string_value like ? <include refid="alfresco.util.escape"/>
         )
     </delete>
     
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
index d95d011f05..d1276e16a3 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
@@ -210,7 +210,7 @@
         where
             n.type_qname_id = #{typeQNameId} and
             np.qname_id = #{propQNameId} and
-            np.string_value like #{namePattern}
+            np.string_value like #{namePattern} <include refid="alfresco.util.escape"/>
     </select>
     
     <select id="select_oldAttrTenants" resultMap="result_admTenant">
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 0cebe51770..949857b63d 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -325,6 +325,9 @@ patch.personUsagePatch.result2=No people were missing the 'cm:sizeCurrent' prope
 patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
 patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
 
+patch.redeployJbpmAdhocWorkflow.description=Redeploy JBPM adhoc workflow
+patch.redeployJbpmAdhocWorkflow.result=JBPM adhoc workflow redeployed
+
 patch.transferDefinitions.description=Add transfer definitions folder to data dictionary.
 patch.transferDefinitions.result=Transfer definitions folder added to data dictionary.
 
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index fd0de35f2d..908635e272 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -1882,6 +1882,28 @@
         </property>
     </bean>
     
+    <bean id="patch.redeployJbpmAdhocWorkflow" class="org.alfresco.repo.admin.patch.impl.GenericWorkflowPatch" parent="basePatch" >
+        <property name="id"><value>patch.redeployJbpmAdhocWorkflow</value></property>
+        <property name="description"><value>patch.redeployJbpmAdhocWorkflow.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>4204</value></property>
+        <property name="targetSchema"><value>4205</value></property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.updateDmPermissions" />
+            </list>
+        </property>
+        <property name="workflowDefinitions">
+            <list>
+               <props>
+                    <prop key="engineId">jbpm</prop>
+                    <prop key="location">alfresco/workflow/adhoc_processdefinition.xml</prop>
+                    <prop key="mimetype">text/xml</prop>
+               </props>
+            </list>
+        </property>
+    </bean>
+    
     <bean id="patch.db-V3.2-ContentTables2" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V3.2-ContentTables2</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
diff --git a/config/alfresco/public-services-security-context.xml b/config/alfresco/public-services-security-context.xml
index c48ef6c53f..3822fef80e 100644
--- a/config/alfresco/public-services-security-context.xml
+++ b/config/alfresco/public-services-security-context.xml
@@ -358,6 +358,7 @@
                org.alfresco.service.cmr.repository.NodeService.createStore=ACL_METHOD.ROLE_ADMINISTRATOR
                org.alfresco.service.cmr.repository.NodeService.exists=ACL_ALLOW
                org.alfresco.service.cmr.repository.NodeService.getNodeStatus=ACL_NODE.0.sys:base.ReadProperties
+               org.alfresco.service.cmr.repository.NodeService.getNodeRef=AFTER_ACL_NODE.sys:base.ReadProperties
                org.alfresco.service.cmr.repository.NodeService.getRootNode=ACL_NODE.0.sys:base.ReadProperties
                org.alfresco.service.cmr.repository.NodeService.createNode=ACL_NODE.0.sys:base.CreateChildren
                org.alfresco.service.cmr.repository.NodeService.moveNode=ACL_NODE.0.sys:base.DeleteNode,ACL_NODE.1.sys:base.CreateChildren
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 3c8094a0df..b8a96d5e56 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -186,7 +186,7 @@ system.hibernateMaxExecutions=20000
 # Determine if modification timestamp propagation from child to parent nodes is respected or not.
 # Even if 'true', the functionality is only supported for child associations that declare the
 # 'propagateTimestamps' element in the dictionary definition.
-system.enableTimestampPropagation=false
+system.enableTimestampPropagation=true
 
 #
 # Decide if content should be removed from the system immediately after being orphaned.
@@ -565,11 +565,21 @@ authentication.ticket.expiryMode=AFTER_FIXED_TIME
 # The default is PT1H for one hour.
 authentication.ticket.validDuration=PT1H
 
-# Default NFS user mappings
-nfs.user.mappings=admin
+# Default NFS user mappings (empty). Note these users will be able to
+# authenticate through NFS without password so ensure NFS port is secure before
+# enabling and adding mappings
+nfs.enabled=false
+nfs.user.mappings=
 nfs.user.mappings.default.uid=0
 nfs.user.mappings.default.gid=0
 
+#Example NFS user mappings
+#nfs.user.mappings=admin,user1 
+#nfs.user.mappings.value.admin.uid=0 
+#nfs.user.mappings.value.admin.gid=0 
+#nfs.user.mappings.value.user1.uid=500 
+#nfs.user.mappings.value.user1.gid=500 
+
 # Default root path for protocols
 protocols.storeName=${spaces.store}
 protocols.rootPath=/${spaces.company_home.childname}
diff --git a/config/alfresco/rule-services-context.xml b/config/alfresco/rule-services-context.xml
index 6f630dfdf3..5e90a60d92 100644
--- a/config/alfresco/rule-services-context.xml
+++ b/config/alfresco/rule-services-context.xml
@@ -62,9 +62,10 @@
       <constructor-arg>
          <list>
             <ref bean="on-create-node-trigger"/>
-             <ref bean="on-create-child-association-trigger"/>
-             <ref bean="on-content-create-trigger"/>
-             <ref bean="on-content-restore-trigger"/>
+            <ref bean="on-move-node-trigger"/>
+            <ref bean="on-create-child-association-trigger"/>
+            <ref bean="on-content-create-trigger"/>
+            <ref bean="on-content-restore-trigger"/>
          </list>
       </constructor-arg>
    </bean>
@@ -128,6 +129,12 @@
    <bean id="on-create-child-association-trigger" class="org.alfresco.repo.rule.ruletrigger.OnCreateChildAssociationRuleTrigger" parent="rule-trigger-base">
    </bean>
    
+   <bean id="on-move-node-trigger" class="org.alfresco.repo.rule.ruletrigger.OnMoveNodeRuleTrigger" parent="rule-trigger-base">
+      <property name="isClassBehaviour">
+         <value>true</value>
+      </property>
+   </bean>
+   
    <bean id="on-delete-child-association-trigger" class="org.alfresco.repo.rule.ruletrigger.BeforeDeleteChildAssociationRuleTrigger" parent="rule-trigger-base">
       <property name="executeRuleImmediately">
           <value>true</value>
diff --git a/config/alfresco/site-services-context.xml b/config/alfresco/site-services-context.xml
index 48a3043d66..f2baf26754 100644
--- a/config/alfresco/site-services-context.xml
+++ b/config/alfresco/site-services-context.xml
@@ -117,7 +117,7 @@
         </property>
         <!-- Creates Sites which require the ServiceRegistry -->
         <property name="serviceRegistry" ref="ServiceRegistry"/>
-        <property name="siteService" ref="siteService"/>
+        <property name="siteService" ref="SiteService"/>
     </bean>
     
     <!-- Behaviours and policies for Sites -->
diff --git a/config/alfresco/subsystems/email/InboundSMTP/inboundSMTP-context.xml b/config/alfresco/subsystems/email/InboundSMTP/inboundSMTP-context.xml
index b62f469e77..23c442d68c 100755
--- a/config/alfresco/subsystems/email/InboundSMTP/inboundSMTP-context.xml
+++ b/config/alfresco/subsystems/email/InboundSMTP/inboundSMTP-context.xml
@@ -106,9 +106,6 @@
 		<property name="nodeService">
 			<ref bean="NodeService" />
 		</property>
-		<property name="searchService">
-			<ref bean="SearchService" />
-		</property>
 		<property name="contentService">
 			<ref bean="ContentService" />
 		</property>
diff --git a/config/alfresco/workflow/adhoc_processdefinition.xml b/config/alfresco/workflow/adhoc_processdefinition.xml
index 18f41ea967..aea67f80bb 100644
--- a/config/alfresco/workflow/adhoc_processdefinition.xml
+++ b/config/alfresco/workflow/adhoc_processdefinition.xml
@@ -34,6 +34,7 @@
                  mail.parameters.subject = "Adhoc Task " + bpm_workflowDescription;
                  mail.parameters.from = bpm_assignee.properties.email;
                  mail.parameters.text = "It's done";
+                 mail.parameters.ignore_send_failure = true;
                  mail.execute(bpm_package);
               }
            </script>
diff --git a/source/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java b/source/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
index 51c34133a3..9075505bad 100644
--- a/source/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
+++ b/source/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
@@ -26,10 +26,8 @@ import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.alfresco.email.server.EmailServerModel;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.model.ImapModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.encoding.ContentCharsetFinder;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -41,9 +39,6 @@ import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.search.ResultSet;
-import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.apache.commons.logging.Log;
@@ -63,7 +58,6 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
 
     private DictionaryService dictionaryService;
     private NodeService nodeService;
-    private SearchService searchService;
     private ContentService contentService;
     private MimetypeService mimetypeService;
 
@@ -115,14 +109,6 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
         this.nodeService = nodeService;
     }
 
-    /**
-     * @param searchService Alfresco Search Service.
-     */
-    public void setSearchService(SearchService searchService)
-    {
-        this.searchService = searchService;
-    }
-
     /**
      * @return      the service used to determine mimeypte and encoding
      */
@@ -155,21 +141,15 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
         {
             throw new InvalidArgumentException("Incorrect email address format.");
         }
-        StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
-        String query = "@sys\\:node-dbid:" + parts[0];
-        ResultSet resultSet = searchService.query(storeRef, SearchService.LANGUAGE_LUCENE, query);
         try
         {
-            if (resultSet.length() == 1)
-            {
-                return resultSet.getNodeRef(0);
-            }
+            Long dbId = Long.parseLong(parts[0]);
+            return nodeService.getNodeRef(dbId);
         }
-        finally
+        catch (NumberFormatException e)
         {
-            resultSet.close();
+            return null;
         }
-        return null;
     }
 
     /**
@@ -214,16 +194,19 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
     protected void writeContent(NodeRef nodeRef, InputStream content, String mimetype, String encoding)
     {
         InputStream bis = new BufferedInputStream(content, 4092);
-        
-        // Guess the encoding if it is text
-        if (mimetypeService.isText(mimetype))
+
+        // Only guess the encoding if it has not been supplied
+        if (encoding == null)
         {
-            ContentCharsetFinder charsetFinder = mimetypeService.getContentCharsetFinder();
-            encoding = charsetFinder.getCharset(bis, mimetype).name();
-        }
-        else if (encoding == null)
-        {
-            encoding = "UTF-8";
+            if (mimetypeService.isText(mimetype))
+            {
+                ContentCharsetFinder charsetFinder = mimetypeService.getContentCharsetFinder();
+                encoding = charsetFinder.getCharset(bis, mimetype).name();
+            }
+            else
+            {
+                encoding = "UTF-8";
+            }
         }
         
         if (log.isDebugEnabled())
diff --git a/source/java/org/alfresco/filesys/NfsServerNodeMonitor.java b/source/java/org/alfresco/filesys/NfsServerNodeMonitor.java
index 52013f9b60..7269cea9ef 100644
--- a/source/java/org/alfresco/filesys/NfsServerNodeMonitor.java
+++ b/source/java/org/alfresco/filesys/NfsServerNodeMonitor.java
@@ -29,10 +29,11 @@ import org.alfresco.filesys.repo.ContentContext;
 import org.alfresco.jlan.oncrpc.nfs.NFSServer;
 import org.alfresco.jlan.oncrpc.nfs.ShareDetails;
 import org.alfresco.jlan.server.core.DeviceContext;
-import org.alfresco.jlan.server.filesys.FileName;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.node.NodeServicePolicies;
 import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy;
+import org.alfresco.repo.node.NodeServicePolicies.OnCreateChildAssociationPolicy;
+import org.alfresco.repo.node.NodeServicePolicies.OnDeleteChildAssociationPolicy;
 import org.alfresco.repo.node.NodeServicePolicies.OnDeleteNodePolicy;
 import org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy;
 import org.alfresco.repo.policy.JavaBehaviour;
@@ -40,7 +41,6 @@ import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.cmr.security.PermissionService;
@@ -58,6 +58,8 @@ public class NfsServerNodeMonitor
         implements
         NodeServicePolicies.OnUpdatePropertiesPolicy,
         NodeServicePolicies.BeforeDeleteNodePolicy,
+        NodeServicePolicies.OnCreateChildAssociationPolicy,
+        NodeServicePolicies.OnDeleteChildAssociationPolicy,
         NodeServicePolicies.OnDeleteNodePolicy,
         InitializingBean
 {
@@ -195,6 +197,8 @@ public class NfsServerNodeMonitor
                 LOGGER.debug("StoreRef='" + targetStoreRef + "' was found for '" + targetDeviceName + "' device name");
             }
 
+            policyComponent.bindAssociationBehaviour(OnCreateChildAssociationPolicy.QNAME, this, new JavaBehaviour(this, "onCreateChildAssociation"));
+            policyComponent.bindAssociationBehaviour(OnDeleteChildAssociationPolicy.QNAME, this, new JavaBehaviour(this, "onDeleteChildAssociation"));
             policyComponent.bindClassBehaviour(OnDeleteNodePolicy.QNAME, this, new JavaBehaviour(this, "onDeleteNode"));
             policyComponent.bindClassBehaviour(BeforeDeleteNodePolicy.QNAME, this, new JavaBehaviour(this, "beforeDeleteNode"));
             policyComponent.bindClassBehaviour(OnUpdatePropertiesPolicy.QNAME, this, new JavaBehaviour(this, "onUpdateProperties"));
@@ -232,9 +236,7 @@ public class NfsServerNodeMonitor
 
             if (((null == oldName) && (null != newName)) || ((null != oldName) && !oldName.equals(newName)))
             {
-                String path = buildRelativePath(nodeRef, newName);
-
-                updateNfsCache(nodeRef, path);
+                updateNfsCache(nodeRef, null);
             }
         }
     }
@@ -252,11 +254,19 @@ public class NfsServerNodeMonitor
     @Override
     public void onDeleteNode(ChildAssociationRef childAssocRef, boolean isNodeArchived)
     {
-        NodeRef nodeRef = (null != childAssocRef) ? (childAssocRef.getChildRef()) : (null);
-        if (enabled && (null != nfsServer) && (null != nodeRef) && targetStoreRef.equals(nodeRef.getStoreRef()))
-        {
-            updateNfsCache(nodeRef, null);
-        }
+        updateNfsCache(childAssocRef.getChildRef(), null);
+    }
+
+    @Override
+    public void onCreateChildAssociation(ChildAssociationRef childAssocRef, boolean isNewNode)
+    {
+        updateNfsCache(childAssocRef.getChildRef(), null);
+    }
+
+    @Override
+    public void onDeleteChildAssociation(ChildAssociationRef childAssocRef)
+    {
+        updateNfsCache(childAssocRef.getChildRef(), null);
     }
 
     /**
@@ -285,41 +295,6 @@ public class NfsServerNodeMonitor
         return null;
     }
 
-    /**
-     * Builds path relative to NFS device name e.g. for the nfs.domain.name:/DeviceName/folder/document.doc method will return \folder\document.doc
-     * 
-     * @param nodeRef - {@link NodeRef} instance for target node
-     * @param newName - {@link String} value which contains new name for the node
-     * @return {@link String} value of relative path
-     */
-    private String buildRelativePath(NodeRef nodeRef, String newName)
-    {
-        String result = null;
-        Path path = nodeService.getPath(nodeRef);
-        if (null != path)
-        {
-            StringBuilder newPath = new StringBuilder(path.toDisplayPath(nodeService, permissionService));
-            if ((NIX_SEPARATOR == newPath.charAt(0)) || (FileName.DOS_SEPERATOR == newPath.charAt(0)))
-            {
-                newPath.delete(0, 1);
-            }
-            int indexOfFirstSeparator = newPath.indexOf(NIX_SEPARATOR_STR);
-            indexOfFirstSeparator = (-1 == indexOfFirstSeparator) ? (newPath.indexOf(FileName.DOS_SEPERATOR_STR)) : (indexOfFirstSeparator);
-            char lastChar = newPath.charAt(newPath.length() - 1);
-            if ((FileName.DOS_SEPERATOR != lastChar) && (NIX_SEPARATOR != lastChar))
-            {
-                newPath.append(FileName.DOS_SEPERATOR);
-            }
-            if (-1 == indexOfFirstSeparator)
-            {
-                indexOfFirstSeparator = newPath.length() - 1;
-            }
-            newPath = newPath.append(newName).delete(0, indexOfFirstSeparator);
-            result = newPath.toString().replace(NIX_SEPARATOR, FileName.DOS_SEPERATOR);
-        }
-        return result;
-    }
-
     /**
      * Updates NFS cache for specified node. <code>newPath</code> equal to <code>null</code> determines that node should be deleted from the cache
      * 
@@ -328,6 +303,10 @@ public class NfsServerNodeMonitor
      */
     private void updateNfsCache(NodeRef nodeRef, String newPath)
     {
+        if (!enabled  || nfsServer == null || !targetStoreRef.equals(nodeRef.getStoreRef()))
+        {
+            return;
+        }
         int dbId = -1;
         if (cachedNodes.containsKey(nodeRef))
         {
diff --git a/source/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java b/source/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java
index 407a87bffd..0794f6fd22 100644
--- a/source/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java
+++ b/source/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java
@@ -18,14 +18,12 @@
  */
 package org.alfresco.filesys.auth.nfs;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
-import javax.transaction.Status;
-import javax.transaction.UserTransaction;
-
-import org.springframework.extensions.config.ConfigElement;
 import org.alfresco.filesys.AlfrescoConfigSection;
 import org.alfresco.filesys.alfresco.AlfrescoClientInfo;
 import org.alfresco.jlan.oncrpc.AuthType;
@@ -39,13 +37,15 @@ import org.alfresco.jlan.server.auth.ClientInfo;
 import org.alfresco.jlan.server.config.InvalidConfigurationException;
 import org.alfresco.jlan.server.config.ServerConfiguration;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
-import org.alfresco.repo.security.authentication.AuthenticationException;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.config.ConfigElement;
 
 /**
  * Alfresco RPC Authenticator Class
@@ -66,13 +66,13 @@ public class AlfrescoRpcAuthenticator implements RpcAuthenticator, InitializingB
 
     // UID/GID to username conversions
     
-    private HashMap<Integer, String> m_idMap;
+    private Map<Integer, String> m_idMap = Collections.emptyMap();
     
     private List<UserMapping> userMappings;
 
     private AuthenticationComponent authenticationComponent;
     
-    private AuthenticationService authenticationService;
+    private MutableAuthenticationService authenticationService;
 
     private TransactionService transactionService;
 
@@ -86,7 +86,7 @@ public class AlfrescoRpcAuthenticator implements RpcAuthenticator, InitializingB
         this.authenticationComponent = authenticationComponent;
     }
 
-    public void setAuthenticationService (AuthenticationService authenticationService)
+    public void setAuthenticationService (MutableAuthenticationService authenticationService)
     {
         this.authenticationService = authenticationService;
     }
@@ -266,109 +266,91 @@ public class AlfrescoRpcAuthenticator implements RpcAuthenticator, InitializingB
      * @param sess SrvSession
      * @param client ClientInfo
      */
-    public void setCurrentUser( SrvSession sess, ClientInfo client)
+    public void setCurrentUser(SrvSession sess, final ClientInfo client)
     {
-        // Start a transaction
-        
-      UserTransaction tx = createTransaction(); 
-
-      try
-      {
-        // start the transaction
-        
-        tx.begin();
-
-        // Check the account type and setup the authentication context
-        
-        if ( client == null || client.isNullSession() || client instanceof AlfrescoClientInfo == false)
+        try
         {
-            // Clear the authentication, null user should not be allowed to do any service calls
-            
-            getAuthenticationComponent().clearCurrentSecurityContext();
-            
-            // DEBUG
-            
-            if ( logger.isDebugEnabled())
-                logger.debug("Clear security context, client=" + client);
-        }
-        else if ( client.isGuest() == false)
-        {
-          // Access the Alfresco client
+          // start the transaction
+    
+          doInTransaction(new RetryingTransactionCallback<Void>()
+          {
+              @Override
+              public Void execute() throws Throwable
+              {
+                  // Check the account type and setup the authentication context
+                  
+                  if ( client == null || client.isNullSession() || client instanceof AlfrescoClientInfo == false)
+                  {
+                      // Clear the authentication, null user should not be allowed to do any service calls
+                      
+                      getAuthenticationComponent().clearCurrentSecurityContext();
+                      
+                      // DEBUG
+                      
+                      if ( logger.isDebugEnabled())
+                          logger.debug("Clear security context, client=" + client);
+                  }
+                  else if ( client.isGuest() == false)
+                  {
+                    // Access the Alfresco client
+                    
+                    AlfrescoClientInfo alfClient = (AlfrescoClientInfo) client;
+                    
+                      // Check if the authentication token has been set for the client
+                      
+                      if ( !alfClient.hasAuthenticationTicket() )
+                      {
+                          // ALF-9793: It's possible that the user we're about to accept doesn't even exist, yet we
+                          // are using alfresco authentication. In such cases we must automatically create
+                          // authentication (using a randomized password) in order to successfully authenticate.
           
-          AlfrescoClientInfo alfClient = (AlfrescoClientInfo) client;
+                          if (!authenticationService.authenticationExists( client.getUserName()) && authenticationService.isAuthenticationCreationAllowed())
+                          {
+                              authenticationService.createAuthentication( client.getUserName(), GUID.generate().toCharArray());
+                          }
+                          // Set the current user and retrieve the authentication token
+                          
+                          getAuthenticationComponent().setCurrentUser( client.getUserName());
+                          alfClient.setAuthenticationTicket(getAuthenticationService().getCurrentTicket());
           
-            // Check if the authentication token has been set for the client
-            
-            if ( !alfClient.hasAuthenticationTicket() )
-            {
-                // Set the current user and retrieve the authentication token
-                
-                getAuthenticationComponent().setCurrentUser( client.getUserName());
-                alfClient.setAuthenticationTicket(getAuthenticationService().getCurrentTicket());
+                          // DEBUG
+                          
+                          if ( logger.isDebugEnabled())
+                              logger.debug("Set user name=" + client.getUserName() + ", ticket=" + alfClient.getAuthenticationTicket());
+                      }
+                      else
+                      {
+                          // Set the authentication context for the request
+                          
+                          getAuthenticationService().validate(alfClient.getAuthenticationTicket());
+                          
+                          // DEBUG
+                          
+                          if ( logger.isDebugEnabled())
+                              logger.debug("Set user using auth ticket, ticket=" + alfClient.getAuthenticationTicket());
+                      }
+                  }
+                  else
+                  {
+                      // Enable guest access for the request
+                      
+                    getAuthenticationComponent().setGuestUserAsCurrentUser();
+                      
+                    // DEBUG
+                      
+                    if ( logger.isDebugEnabled())
+                      logger.debug("Set guest user");
+                  }
+                  return null;
+              }
+          });
 
-                // DEBUG
-                
-                if ( logger.isDebugEnabled())
-                    logger.debug("Set user name=" + client.getUserName() + ", ticket=" + alfClient.getAuthenticationTicket());
-            }
-            else
-            {
-                // Set the authentication context for the request
-                
-                getAuthenticationService().validate(alfClient.getAuthenticationTicket());
-                
-                // DEBUG
-                
-                if ( logger.isDebugEnabled())
-                    logger.debug("Set user using auth ticket, ticket=" + alfClient.getAuthenticationTicket());
-            }
-        }
-        else
-        {
-            // Enable guest access for the request
-            
-          getAuthenticationComponent().setGuestUserAsCurrentUser();
-            
-          // DEBUG
-            
-          if ( logger.isDebugEnabled())
-            logger.debug("Set guest user");
-        }
       }
       catch ( Exception ex)
       {
         if ( logger.isErrorEnabled())
           logger.error( "Error in RPC authenticator setting current user", ex);
       }
-      finally
-      {
-        // Commit the transaction
-        
-        if ( tx != null)
-        {
-            try
-            {
-                // Commit or rollback the transaction
-                
-                if ( tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)
-                {
-                    // Transaction is marked for rollback
-                    
-                    tx.rollback();
-                }
-                else
-                {
-                    // Commit the transaction
-                    
-                    tx.commit();
-                }
-            }
-            catch ( Exception ex)
-            {
-            }
-        }
-      }
-
     }
     
     /**
@@ -386,7 +368,7 @@ public class AlfrescoRpcAuthenticator implements RpcAuthenticator, InitializingB
         
         // Copy over relevant bean properties for backward compatibility
         setAuthenticationComponent(alfrescoConfig.getAuthenticationComponent());
-        setAuthenticationService(alfrescoConfig.getAuthenticationService());
+        setAuthenticationService((MutableAuthenticationService) alfrescoConfig.getAuthenticationService());
         setTransactionService(alfrescoConfig.getTransactionService());
 
         // Check for the user mappings
@@ -503,19 +485,16 @@ public class AlfrescoRpcAuthenticator implements RpcAuthenticator, InitializingB
                 }
             }
         }
-        
-        // Make sure there are some user mappings
-        
-        if ( m_idMap == null || m_idMap.size() == 0)
-            throw new InvalidConfigurationException("No user mappings for RPC authenticator");
     }
     
     /**
-     * Create a transaction, this will be a writable transaction unless the system is in read-only mode.
+     * Does work in a transaction. This will be a writeable transaction unless the system is in read-only mode.
      * 
-     * return UserTransaction
+     * @param callback
+     *            a callback that does the work
+     * @return the result, or <code>null</code> if not applicable
      */
-    protected final UserTransaction createTransaction()
+    protected <T> T doInTransaction(RetryingTransactionHelper.RetryingTransactionCallback<T> callback)
     {
         // Get the transaction service
         
@@ -526,9 +505,7 @@ public class AlfrescoRpcAuthenticator implements RpcAuthenticator, InitializingB
         if ( logger.isDebugEnabled())
             logger.debug("Using " + (txService.isReadOnly() ? "ReadOnly" : "Write") + " transaction");
         
-        // Create the transaction
-        
-        return txService.getUserTransaction( txService.isReadOnly() ? true : false);
+        return txService.getRetryingTransactionHelper().doInTransaction(callback, txService.isReadOnly());
     }
     
     protected AuthenticationComponent getAuthenticationComponent()
@@ -536,7 +513,7 @@ public class AlfrescoRpcAuthenticator implements RpcAuthenticator, InitializingB
         return this.authenticationComponent;
     }
     
-    protected AuthenticationService getAuthenticationService()
+    protected MutableAuthenticationService getAuthenticationService()
     {
         return this.authenticationService;
     }
diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
index 174e817ae2..67fcdddef0 100644
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
@@ -1527,16 +1527,26 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
 	                
 	                // Get the file information to check if the file/folder exists
 	                
-	                FileInfo info = getFileInformation(sess, tree, name);
-	                if (info.isDirectory())
-	                {
-	                    status = FileStatus.DirectoryExists;
+                    FileInfo info = getFileInformation(sess, tree, name);
+                    NodeRef nodeRef = getNodeOrNull(name, ctx, fstate);
+                    nodeRef = ((null == nodeRef) && (info instanceof ContentFileInfo)) ? (((ContentFileInfo) info).getNodeRef()) : (nodeRef);
+
+                    if ((null == nodeRef) || !fileFolderService.exists(nodeRef))
+                    {
+                        status = FileStatus.NotExist;
+                    }
+                    else
+                    {
+		                if (info.isDirectory())
+		                {
+		                    status = FileStatus.DirectoryExists;
+		                }
+		                else
+		                {
+		                    status = FileStatus.FileExists;
+		                }
 	                }
-	                else
-	                {
-	                    status = FileStatus.FileExists;
-	                }
-	                
+
 	                // Update the file state status
 
 	                if ( fstate != null)
@@ -3877,29 +3887,14 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
         
         ContentContext ctx = (ContentContext) tree.getContext();
         
+        NodeRef result = null;
         if ( ctx.hasStateCache())
         {
             // Try and get the node ref from an in memory file state
-            
             FileState fstate = ctx.getStateCache().findFileState(path);
-            if ( fstate != null && fstate.hasFilesystemObject() && fstate.exists() )
+            if (null != (result = getNodeOrNull(path, ctx, fstate)))
             {
-                // Check that the node exists
-                
-                if (fileFolderService.exists((NodeRef) fstate.getFilesystemObject()))
-                {
-                    // Bump the file states expiry time
-                    
-                    fstate.setExpiryTime(System.currentTimeMillis() + FileState.DefTimeout);
-                    
-                    // Return the cached noderef
-                    
-                    return (NodeRef) fstate.getFilesystemObject();
-                }
-                else
-                {
-                    ctx.getStateCache().removeFileState(path);
-                }
+                return result;
             }
         }
         
@@ -3907,14 +3902,41 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
         
         return cifsHelper.getNodeRef(ctx.getRootNode(), path);
     }
-    
+
+    /**
+     * Determines current existence state of the file object from the cache.
+     * Updates state of the object in the cache according to existence state: increasing expiration time if
+     * object exists or removing object from the cache if it does not exist
+     * 
+     * @param path - {@link String} value which contains relative path to the file object
+     * @param ctx - {@link ContentContext} instance of the current {@link TreeConnection}
+     * @param fstate - {@link FileState} instance which represents current state of the cached object
+     * @return {@link NodeRef} instance of existent file object or <code>null</code> if object is not exist
+     */
+    private NodeRef getNodeOrNull(String path, ContentContext ctx, FileState fstate)
+    {
+        if ((null != fstate) && fstate.hasFilesystemObject() && fstate.exists())
+        {
+            // Check that the node exists
+            if (fileFolderService.exists((NodeRef) fstate.getFilesystemObject()))
+            {
+                // Bump the file states expiry time
+                fstate.setExpiryTime(System.currentTimeMillis() + FileState.DefTimeout);
+
+                // Return the cached noderef
+                return (NodeRef) fstate.getFilesystemObject();
+            }
+            else
+            {
+                ctx.getStateCache().removeFileState(path);
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Convert a node into a share relative path
-     * 
-     * @param tree TreeConnection
-     * @param nodeRef NodeRef
-     * @return String
-     * @exception FileNotFoundException
      */
     public String getPathForNode( TreeConnection tree, NodeRef nodeRef)
         throws FileNotFoundException
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeService.java b/source/java/org/alfresco/repo/avm/AVMNodeService.java
index bf42c80519..b898b7648f 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeService.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeService.java
@@ -308,7 +308,16 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
         // need to capture Transaction IDs.
         return new NodeRef.Status(nodeRef, "Unknown", null, !exists(nodeRef));
     }
-    
+
+    /**
+     * @throws UnsupportedOperationException always
+     */
+    @Override
+    public NodeRef getNodeRef(Long nodeId)
+    {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * @param storeRef a reference to an existing store
      * @return Returns a reference to the root node of the store
diff --git a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
index 4981c22812..c719295546 100644
--- a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -1143,9 +1143,6 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             {
                 Long oldParentNodeId = primaryParentAssoc.getParentNode().getId();
                 oldParentAclId = getNodeNotNull(oldParentNodeId).getAclId();
-                
-                // Update the parent node, if required
-                propagateTimestamps(childNodeId);
             }
         }
         
@@ -1192,12 +1189,12 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             childNodeUpdate.setUpdateDeleted(true);
             // Update the entity.
             // Note: We don't use delete here because that will attempt to clean everything up again.
-            updateNodeImpl(childNode, childNodeUpdate);
+            updateNodeImpl(childNode, childNodeUpdate, true);
         }
         else
         {
             // Ensure that the child node reflects the current txn and auditable data
-            touchNodeImpl(childNodeId);
+            touchNodeImpl(childNodeId, true);
             
             // The moved node's reference has not changed, so just remove the cache entry to
             // it's immediate parent.  All children of the moved node will still point to the
@@ -1263,7 +1260,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     }
     
     @Override
-    public void updateNode(Long nodeId, QName nodeTypeQName, Locale nodeLocale)
+    public void updateNode(Long nodeId, QName nodeTypeQName, Locale nodeLocale, boolean propagate)
     {
         // Get the existing node; we need to check for a change in store or UUID
         Node oldNode = getNodeNotNull(nodeId);
@@ -1304,13 +1301,13 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             nodeUpdate.setUpdateLocaleId(true);
         }
 
-        updateNodeImpl(oldNode, nodeUpdate);
+        updateNodeImpl(oldNode, nodeUpdate, propagate);
     }
     
     /**
      * Updates the node's transaction and <b>cm:auditable</b> properties only.
      */
-    private void touchNodeImpl(Long nodeId)
+    private void touchNodeImpl(Long nodeId, boolean propagate)
     {
         Node node = null;
         try
@@ -1326,7 +1323,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
         nodeUpdate.setId(nodeId);
         // Update it
-        updateNodeImpl(node, nodeUpdate);
+        updateNodeImpl(node, nodeUpdate, propagate);
     }
     
     /**
@@ -1338,9 +1335,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
      * 
      * @param oldNode               the existing node, fully populated
      * @param nodeUpdate            the node update with all update elements populated
-     * @return                      the updated node ID and reference
+     * @param propagate             should this update be propagated to parent audit properties?
      */
-    private void updateNodeImpl(Node oldNode, NodeUpdateEntity nodeUpdate)
+    private void updateNodeImpl(Node oldNode, NodeUpdateEntity nodeUpdate, boolean propagate)
     {
         Long nodeId = oldNode.getId();
         
@@ -1456,7 +1453,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         }
 
         // Ensure that cm:auditable values are propagated, if required
-        if (enableTimestampPropagation &&
+        if (propagate && enableTimestampPropagation &&
                 nodeUpdate.isUpdateAuditableProperties() &&
                 nodeUpdate.getAuditableProperties() != null)
         {
@@ -1606,7 +1603,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         nodeUpdateEntity.setId(nodeId);
         nodeUpdateEntity.setAclId(aclId);
         nodeUpdateEntity.setUpdateAclId(true);
-        updateNodeImpl(oldNode, nodeUpdateEntity);
+        updateNodeImpl(oldNode, nodeUpdateEntity, true);
     }
     
     public void setPrimaryChildrenSharedAclId(
@@ -2015,7 +2012,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         // Touch to bring into current transaction
         if (updated)
         {
-            updateNodeImpl(node, nodeUpdate);
+            updateNodeImpl(node, nodeUpdate, propsToAdd.containsKey(ContentModel.PROP_NAME));
         }
         
         // Done
@@ -2083,7 +2080,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             cachedProps.keySet().removeAll(propertyQNames);
             setNodePropertiesCached(nodeId, cachedProps);
             // Touch to bring into current txn
-            touchNodeImpl(nodeId);
+            touchNodeImpl(nodeId, propertyQNames.contains(ContentModel.PROP_NAME));
         }
         // Done
         return deleteCount > 0;
@@ -2241,7 +2238,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         }
 
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
         
         // Done
         return true;
@@ -2263,7 +2260,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         aspectsCache.setValue(nodeId, Collections.<QName>emptySet());
 
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
         
         // Done
         return deleteCount > 0;
@@ -2289,7 +2286,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         }
         
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
         
         // Done
         return deleteCount > 0;
@@ -2367,7 +2364,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         }
         
         // Touch to bring into current txn and ensure concurrency is maintained on the nodes
-        touchNodeImpl(sourceNodeId);
+        touchNodeImpl(sourceNodeId, false);
 
         // Resolve type QName
         Long assocTypeQNameId = qnameDAO.getOrCreateQName(assocTypeQName).getFirst();
@@ -2413,7 +2410,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             return 0;
         }
         // Touch to bring into current txn
-        touchNodeImpl(sourceNodeId);
+        touchNodeImpl(sourceNodeId, false);
 
         Long assocTypeQNameId = assocTypeQNamePair.getFirst();
         return deleteNodeAssoc(sourceNodeId, targetNodeId, assocTypeQNameId);
@@ -2422,7 +2419,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     public int removeNodeAssocsToAndFrom(Long nodeId)
     {
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
 
         return deleteNodeAssocsToAndFrom(nodeId);
     }
@@ -2436,7 +2433,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             return 0;
         }
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
 
         return deleteNodeAssocsToAndFrom(nodeId, assocTypeQNameIds);
     }
@@ -2604,7 +2601,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         // node into the current transaction for secondary associations
         if (!isPrimary)
         {
-            updateNode(childNodeId, null, null);
+            updateNode(childNodeId, null, null, true);
         }
         
         // Done
diff --git a/source/java/org/alfresco/repo/domain/node/NodeDAO.java b/source/java/org/alfresco/repo/domain/node/NodeDAO.java
index 23855cad45..05b33933fd 100644
--- a/source/java/org/alfresco/repo/domain/node/NodeDAO.java
+++ b/source/java/org/alfresco/repo/domain/node/NodeDAO.java
@@ -192,8 +192,9 @@ public interface NodeDAO extends NodeBulkLoader
     /**
      * @param nodeTypeQName     the new type QName for the node or <tt>null</tt> to keep the existing one
      * @param nodeLocale        the new locale for the node or <tt>null</tt> to keep the existing one
+     * @param propagate         should this update be propagated to parent audit properties?
      */
-    public void updateNode(Long nodeId, QName nodeTypeQName, Locale nodeLocale);
+    public void updateNode(Long nodeId, QName nodeTypeQName, Locale nodeLocale, boolean propagate);
     
     public void setNodeAclId(Long nodeId, Long aclId);
     
diff --git a/source/java/org/alfresco/repo/forms/processor/workflow/DataKeyMatcher.java b/source/java/org/alfresco/repo/forms/processor/workflow/DataKeyMatcher.java
index cbe50cf904..230ce164a0 100644
--- a/source/java/org/alfresco/repo/forms/processor/workflow/DataKeyMatcher.java
+++ b/source/java/org/alfresco/repo/forms/processor/workflow/DataKeyMatcher.java
@@ -40,7 +40,7 @@ public class DataKeyMatcher
      * names will look like <code>"prop_cm_name"</code>. The pattern can also be
      * used to extract the "cm" and the "name" parts.
      */
-    private final static Pattern propertyNamePattern = Pattern.compile("(^[a-zA-Z0-9]+)_([a-zA-Z0-9_]+$)");
+    private final static Pattern propertyNamePattern = Pattern.compile("(^[a-zA-Z0-9-]+)_([a-zA-Z0-9_]+$)");
 
     /**
      * A regular expression which can be used to match association names. These
@@ -48,7 +48,7 @@ public class DataKeyMatcher
      * pattern can also be used to extract the "cm", the "name" and the suffix
      * parts.
      */
-    private final static Pattern associationNamePattern = Pattern.compile("(^[a-zA-Z0-9]+)_([a-zA-Z0-9_]+)(_[a-zA-Z]+$)");
+    private final static Pattern associationNamePattern = Pattern.compile("(^[a-zA-Z0-9-]+)_([a-zA-Z0-9_]+)(_[a-zA-Z]+$)");
 
     private final static Pattern transientAssociationPattern = Pattern.compile("(^[a-zA-Z0-9]+)(_[a-zA-Z]+$)");
 
diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
index 095b9a8095..8290567677 100644
--- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
+++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
@@ -2298,7 +2298,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
             for(Serializable name : foldersCache.getKeys())
             {
                 AlfrescoImapFolder folder = (AlfrescoImapFolder) foldersCache.get(name);
-                if (folderNodeRef.equals(folder.getFolderInfo().getNodeRef()))
+                if (folder == null || folderNodeRef.equals(folder.getFolderInfo().getNodeRef()))
                 {
                     toRemove.add(name);
                     break;
@@ -2330,7 +2330,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
             for(Serializable name : foldersCache.getKeys())
             {
                 AlfrescoImapFolder folder = (AlfrescoImapFolder) foldersCache.get(name);
-                if (folderNodeRef.equals(folder.getFolderInfo().getNodeRef()))
+                if (folder == null || folderNodeRef.equals(folder.getFolderInfo().getNodeRef()))
                 {
                     foldersCache.remove(name);
                     break;
diff --git a/source/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java b/source/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
index 6de899c6f6..aca08eae41 100644
--- a/source/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
+++ b/source/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
@@ -20,12 +20,15 @@ package org.alfresco.repo.management.subsystems;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.aop.framework.ProxyFactoryBean;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
+import org.springframework.context.ApplicationContext;
 
 /**
  * A factory bean, normally used in conjunction with {@link ChildApplicationContextFactory} allowing selected
@@ -42,6 +45,11 @@ public class SubsystemProxyFactory extends ProxyFactoryBean
     /** An optional bean name to look up in the source application context **/
     private String sourceBeanName;
 
+    private ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+    private ApplicationContext context;
+    private Object sourceBean;
+    private Map <Class<?>, Object> typedBeans = new HashMap<Class<?>, Object>(7);
+
     /**
      * Instantiates a new managed subsystem proxy factory.
      */
@@ -54,23 +62,7 @@ public class SubsystemProxyFactory extends ProxyFactoryBean
                 Method method = mi.getMethod();
                 try
                 {
-                    if (SubsystemProxyFactory.this.sourceBeanName == null)
-                    {
-                        Map<?, ?> beans = SubsystemProxyFactory.this.sourceApplicationContextFactory
-                                .getApplicationContext().getBeansOfType(method.getDeclaringClass());
-                        if (beans.size() != 1)
-                        {
-                            throw new RuntimeException("Don't know where to route call to method " + method);
-                        }
-                        return method.invoke(beans.values().iterator().next(), mi.getArguments());
-                    }
-                    else
-                    {
-                        Object bean = SubsystemProxyFactory.this.sourceApplicationContextFactory
-                                .getApplicationContext().getBean(SubsystemProxyFactory.this.sourceBeanName);
-                        return method.invoke(bean, mi.getArguments());
-
-                    }
+                    return method.invoke(locateBean(mi), mi.getArguments());
                 }
                 catch (InvocationTargetException e)
                 {
@@ -112,5 +104,74 @@ public class SubsystemProxyFactory extends ProxyFactoryBean
     public void setSourceBeanName(String sourceBeanName)
     {
         this.sourceBeanName = sourceBeanName;
-    }           
+    }
+    
+    // Bring our cached copies of the source beans in line with the application context factory, using a RW lock to
+    // ensure consistency
+    private Object locateBean(MethodInvocation mi)
+    {
+        boolean haveWriteLock = false;
+        this.lock.readLock().lock();
+        try
+        {
+            ApplicationContext newContext = this.sourceApplicationContextFactory.getApplicationContext();
+            if (this.context != newContext)
+            {
+                // Upgrade the lock
+                this.lock.readLock().unlock();
+                this.lock.writeLock().lock();
+                haveWriteLock = true;
+
+                newContext = this.sourceApplicationContextFactory.getApplicationContext();
+                this.context = newContext;
+                this.typedBeans.clear();
+                this.sourceBean = null;
+                if (this.sourceBeanName != null)
+                {
+                    this.sourceBean = newContext.getBean(this.sourceBeanName);
+                }
+            }
+            if (this.sourceBean == null)
+            {
+                Method method = mi.getMethod();                
+                Class<?> type = method.getDeclaringClass();
+                Object bean = this.typedBeans.get(type);
+                if (bean == null)
+                {
+                    // Upgrade the lock if necessary
+                    if (!haveWriteLock)
+                    {
+                        this.lock.readLock().unlock();
+                        this.lock.writeLock().lock();
+                        haveWriteLock = true;
+                    }
+                    bean = this.typedBeans.get(type);
+                    if (bean == null)
+                    {
+                        Map<?, ?> beans = this.context.getBeansOfType(type);
+                        if (beans.size() != 1)
+                        {
+                            throw new RuntimeException("Don't know where to route call to method " + method);
+                        }
+                        bean = beans.values().iterator().next();
+                        this.typedBeans.put(type, bean);
+                    }
+                }
+                return bean;
+            }
+            return this.sourceBean;
+        }
+        finally
+        {
+            if (haveWriteLock)
+            {
+                this.lock.writeLock().unlock();
+            }
+            else
+            {
+                this.lock.readLock().unlock();
+            }
+        }
+    }
+    
 }
diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
index e52371ec2b..1a9bbd32a6 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
@@ -1024,12 +1024,6 @@ public class FileFolderServiceImplTest extends TestCase
         txn.commit();
         
         nodeService.addAspect(workingRootNodeRef, ContentModel.ASPECT_AUDITABLE, null);
-
-        // Get the current dates for the parent folder (one level up)
-        String creatorTooHigh = (String) nodeService.getProperty(workingRootNodeRef, ContentModel.PROP_CREATOR);
-        Date createdTooHigh = (Date) nodeService.getProperty(workingRootNodeRef, ContentModel.PROP_CREATED);
-        String modifierTooHigh = (String) nodeService.getProperty(workingRootNodeRef, ContentModel.PROP_MODIFIER);
-        Date modifiedTooHigh = (Date) nodeService.getProperty(workingRootNodeRef, ContentModel.PROP_MODIFIED);
         
         FileInfo folderInfo = fileFolderService.create(workingRootNodeRef, "SomeFolder", ContentModel.TYPE_FOLDER);
         NodeRef folderNodeRef = folderInfo.getNodeRef();
@@ -1039,7 +1033,13 @@ public class FileFolderServiceImplTest extends TestCase
         String modifierExpected = (String) nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIER);
         Date modifiedExpected = (Date) nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIED);
         
-        // Create a new file and check the parent (expect no changes)
+        // Get the current dates for the parent folder (one level up)
+        String creatorTooHigh = (String) nodeService.getProperty(workingRootNodeRef, ContentModel.PROP_CREATOR);
+        Date createdTooHigh = (Date) nodeService.getProperty(workingRootNodeRef, ContentModel.PROP_CREATED);
+        String modifierTooHigh = (String) nodeService.getProperty(workingRootNodeRef, ContentModel.PROP_MODIFIER);
+        Date modifiedTooHigh = (Date) nodeService.getProperty(workingRootNodeRef, ContentModel.PROP_MODIFIED);
+
+        // Create a new file and check the parent (expect changes)
         FileInfo fileInfo = fileFolderService.create(folderNodeRef, "Something.html", ContentModel.TYPE_CONTENT);
         NodeRef fileNodeRef = fileInfo.getNodeRef();
         nodeService.addAspect(fileNodeRef, ContentModel.ASPECT_AUDITABLE, null);
@@ -1050,13 +1050,13 @@ public class FileFolderServiceImplTest extends TestCase
         assertEquals("cm:created should not have changed",
                 createdExpected,
                 nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATED));
-        assertEquals("cm:modifier should not have changed",
-                modifierExpected,
+        assertEquals("cm:modifier should have changed",
+                nodeService.getProperty(fileNodeRef, ContentModel.PROP_MODIFIER),
                 nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIER));
-        assertEquals("cm:modified should not have changed",
-                modifiedExpected,
+        assertEquals("cm:modified should have changed",
+                nodeService.getProperty(fileNodeRef, ContentModel.PROP_MODIFIED),
                 nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIED));
-        // Update the child and check parent (expect no changes)
+        // Rename the child and check parent (expect changes)
         fileFolderService.rename(fileNodeRef, "something.html");
         assertEquals("cm:creator should not have changed",
                 creatorExpected,
@@ -1067,11 +1067,12 @@ public class FileFolderServiceImplTest extends TestCase
         assertEquals("cm:modifier should not have changed",
                 modifierExpected,
                 nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIER));
-        assertEquals("cm:modified should not have changed",
+        assertNotSame("cm:modified should have changed",
                 modifiedExpected,
                 nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIED));
-        // Delete node and check parent (expect no changes)
-        fileFolderService.delete(fileNodeRef);
+        // Update the child and check parent (expect NO changes)
+        modifiedExpected = (Date) nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIED);
+        nodeService.setProperty(fileNodeRef, ContentModel.PROP_TITLE, "Hippo");
         assertEquals("cm:creator should not have changed",
                 creatorExpected,
                 nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATOR));
@@ -1084,64 +1085,20 @@ public class FileFolderServiceImplTest extends TestCase
         assertEquals("cm:modified should not have changed",
                 modifiedExpected,
                 nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIED));
-        
-        // Force timestamp propagation
-        AbstractNodeDAOImpl nodeDAO = (AbstractNodeDAOImpl) ctx.getBean("nodeDAO");
-        nodeDAO.setEnableTimestampPropagation(true);
-        try
-        {
-            // Create a new file and check the parent (expect modifier changes)
-            fileInfo = fileFolderService.create(folderNodeRef, "Something.html", ContentModel.TYPE_CONTENT);
-            fileNodeRef = fileInfo.getNodeRef();
-            nodeService.addAspect(fileNodeRef, ContentModel.ASPECT_AUDITABLE, null);
-            
-            assertEquals("cm:creator should not have changed",
-                    creatorExpected,
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATOR));
-            assertEquals("cm:created should not have changed",
-                    createdExpected,
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATED));
-            assertEquals("cm:modifier should have changed",
-                    nodeService.getProperty(fileNodeRef, ContentModel.PROP_MODIFIER),
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIER));
-            assertEquals("cm:modified should have changed",
-                    nodeService.getProperty(fileNodeRef, ContentModel.PROP_MODIFIED),
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIED));
-            // Update the child and check parent (expect modifier changes)
-            fileFolderService.rename(fileNodeRef, "something.html");
-            assertEquals("cm:creator should not have changed",
-                    creatorExpected,
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATOR));
-            assertEquals("cm:created should not have changed",
-                    createdExpected,
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATED));
-            assertEquals("cm:modifier should have changed",
-                    nodeService.getProperty(fileNodeRef, ContentModel.PROP_MODIFIER),
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIER));
-            assertEquals("cm:modified should have changed",
-                    nodeService.getProperty(fileNodeRef, ContentModel.PROP_MODIFIED),
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIED));
-            // Delete node and check parent (expect modifier changes)
-            modifiedExpected = (Date) nodeService.getProperty(workingRootNodeRef, ContentModel.PROP_MODIFIED);
-            fileFolderService.delete(fileNodeRef);
-            assertEquals("cm:creator should not have changed",
-                    creatorExpected,
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATOR));
-            assertEquals("cm:created should not have changed",
-                    createdExpected,
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATED));
-            assertSame("cm:modifier should have changed",
-                    modifierExpected,
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIER));
-            assertNotSame("cm:modified should have changed",
-                    modifiedExpected,
-                    nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIED));
-        }
-        finally
-        {
-            nodeDAO.setEnableTimestampPropagation(false);
-        }
-        
+        // Delete node and check parent (expect modifier changes)
+        fileFolderService.delete(fileNodeRef);
+        assertEquals("cm:creator should not have changed",
+                creatorExpected,
+                nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATOR));
+        assertEquals("cm:created should not have changed",
+                createdExpected,
+                nodeService.getProperty(folderNodeRef, ContentModel.PROP_CREATED));
+        assertSame("cm:modifier should have changed",
+                modifierExpected,
+                nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIER));
+        assertNotSame("cm:modified should have changed",
+                modifiedExpected,
+                nodeService.getProperty(folderNodeRef, ContentModel.PROP_MODIFIED));               
         // Finally check that the second level up was NOT modified
         assertEquals("cm:creator should not have changed (level too high)",
                 creatorTooHigh,
diff --git a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
index 0b73b5f0f5..c00afaa971 100644
--- a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
+++ b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
@@ -63,6 +63,7 @@ import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.MLText;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeRef.Status;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.repository.StoreRef;
@@ -3238,4 +3239,10 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
         assertNotNull(checkBlob);
         assertEquals("Blob was modified while persisted", 0, checkBlob.i);
     }
+    
+    public void testGetNodeRefById()
+    {
+        Long nodeId = (Long) nodeService.getProperty(rootNodeRef, ContentModel.PROP_NODE_DBID);
+        assertEquals("Incorrect NodeRef back ", rootNodeRef, nodeService.getNodeRef(nodeId));
+    }
 }
diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
index 653475ccdc..7ede3b1ce4 100644
--- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -176,6 +176,13 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         return status;
     }
 
+    @Override
+    public NodeRef getNodeRef(Long nodeId)
+    {
+        Pair<Long, NodeRef> nodePair = nodeDAO.getNodePair(nodeId);
+        return nodePair == null ? null : nodePair.getSecond();
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -735,7 +742,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         invokeBeforeUpdateNode(nodeRef);
         
         // Set the type
-        nodeDAO.updateNode(nodePair.getFirst(), typeQName, null);
+        nodeDAO.updateNode(nodePair.getFirst(), typeQName, null, false);
         
         // Add the default aspects and properties required for the given type. Existing values will not be overridden.
         addAspectsAndProperties(nodePair, typeQName, null, null, null, null, false);
diff --git a/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java b/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java
index f2d4b5cb2b..61775cb7f6 100644
--- a/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java
+++ b/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java
@@ -438,6 +438,44 @@ public class RuleServiceCoverageTest extends TestCase
         assertFalse("Should not be versionable", nodeService.hasAspect(newNodeRef, ContentModel.ASPECT_VERSIONABLE));
     }
     
+    public void testCheckThatChildRuleFiresOnMove() throws Exception
+    {
+        //ALF-9415 test
+        Map<QName, Serializable> folderProps = new HashMap<QName, Serializable>(1);     
+        folderProps.put(ContentModel.PROP_NAME, "myTestFolder");
+        NodeRef folder = this.nodeService.createNode(
+                this.rootNodeRef,
+                ContentModel.ASSOC_CHILDREN,
+                ContentModel.ASSOC_CHILDREN,
+                ContentModel.TYPE_FOLDER,
+                folderProps).getChildRef();  
+        
+        Map<String, Serializable> params = new HashMap<String, Serializable>(1);
+        params.put("aspect-name", ContentModel.ASPECT_VERSIONABLE);        
+        
+        Rule rule = createRule(
+                RuleType.INBOUND, 
+                AddFeaturesActionExecuter.NAME, 
+                params, 
+                NoConditionEvaluator.NAME, 
+                null);
+        rule.applyToChildren(true);
+        this.ruleService.saveRule(folder, rule);
+        
+        folderProps.put(ContentModel.PROP_NAME, "myMoveFolder");
+        NodeRef folderForMove = this.nodeService.createNode(
+                this.rootNodeRef,
+                ContentModel.ASSOC_CHILDREN,
+                ContentModel.ASSOC_CHILDREN,
+                ContentModel.TYPE_FOLDER,
+                folderProps).getChildRef();
+        
+        NodeRef testFile = this.fileFolderService.create(folderForMove, "testFile.txt", ContentModel.TYPE_CONTENT).getNodeRef();
+        
+        this.fileFolderService.move(folderForMove, folder, null);
+        assertTrue("Should be versionable", nodeService.hasAspect(testFile, ContentModel.ASPECT_VERSIONABLE));
+    }
+    
     /**
      * ALF-4926: Incorrect behavior of update and move rule for the same folder
      * <p/>
diff --git a/source/java/org/alfresco/repo/rule/ruletrigger/OnMoveNodeRuleTrigger.java b/source/java/org/alfresco/repo/rule/ruletrigger/OnMoveNodeRuleTrigger.java
new file mode 100644
index 0000000000..9cf958e203
--- /dev/null
+++ b/source/java/org/alfresco/repo/rule/ruletrigger/OnMoveNodeRuleTrigger.java
@@ -0,0 +1,57 @@
+package org.alfresco.repo.rule.ruletrigger;
+
+import org.alfresco.repo.node.NodeServicePolicies;
+import org.alfresco.repo.policy.JavaBehaviour;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * A rule trigger for when nodes are moved.
+ * 
+ * @since 3.4.6
+ */
+public class OnMoveNodeRuleTrigger extends RuleTriggerAbstractBase implements NodeServicePolicies.OnMoveNodePolicy
+{
+    private static final String POLICY_NAME = NodeServicePolicies.OnMoveNodePolicy.QNAME.getLocalName();
+
+    private boolean isClassBehaviour = false;
+
+    public void setIsClassBehaviour(boolean isClassBehaviour)
+    {
+        this.isClassBehaviour = isClassBehaviour;
+    }
+
+    /**
+     * @see org.alfresco.repo.rule.ruletrigger.RuleTrigger#registerRuleTrigger()
+     */
+    public void registerRuleTrigger()
+    {
+        if (isClassBehaviour == true)
+        {
+            this.policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, POLICY_NAME), this, new JavaBehaviour(this, POLICY_NAME));
+        }
+        else
+        {
+            this.policyComponent.bindAssociationBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, POLICY_NAME), this, new JavaBehaviour(this, POLICY_NAME));
+        }
+    }
+
+    public void onMoveNode(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef)
+    {
+        // Check that it is not rename operation.
+        if (!oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef()))
+        {
+            triggerChildrenRules(newChildAssocRef, newChildAssocRef);
+        }
+    }
+
+    private void triggerChildrenRules(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef)
+    {
+        triggerRules(newChildAssocRef.getParentRef(), newChildAssocRef.getChildRef());
+        for (ChildAssociationRef ref : nodeService.getChildAssocs(newChildAssocRef.getChildRef()))
+        {
+            triggerChildrenRules(ref, ref);
+        }
+    }
+}
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoLuceneQueryLanguage.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoLuceneQueryLanguage.java
index d8c2f472ed..d0088b7504 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoLuceneQueryLanguage.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoLuceneQueryLanguage.java
@@ -196,7 +196,18 @@ public class LuceneAlfrescoLuceneQueryLanguage extends AbstractLuceneQueryLangua
                                     String analyserClassName = propertyDef.resolveAnalyserClassName();
                                     if (analyserClassName.equals(DateTimeAnalyser.class.getCanonicalName()))
                                     {
-                                        field = field + ".sort";
+                                        switch (propertyDef.getIndexTokenisationMode())
+                                        {
+                                        case TRUE:
+                                            requiresPostSort = true;
+                                            break;
+                                        case BOTH:
+                                            field = field + ".sort";
+                                            break;
+                                        case FALSE:
+                                            // Should be able to sort on actual field OK
+                                            break;
+                                        }
                                     }
                                     else
                                     {
diff --git a/source/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java b/source/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java
index 5c1c641116..a7f1cd5679 100644
--- a/source/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java
+++ b/source/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java
@@ -1462,7 +1462,6 @@ public class TaggingServiceImplTest extends TestCase
                  // Auditable checks
                  assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_CREATOR));
                  assertEquals("System", nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_MODIFIER));
-                 testData.origModified = (Date)nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_MODIFIED);
                  
                  
                  // Create a node without tags, which the user
@@ -1495,6 +1494,16 @@ public class TaggingServiceImplTest extends TestCase
                  return null;
             }
         });
+        // Due to timestamp propagation, we need to start a new transaction to get the current folder modified date
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                testData.origModified = (Date)nodeService.getProperty(testData.auditableFolder, ContentModel.PROP_MODIFIED);
+                return null;
+            }
+        });
         transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
         {
             @Override
diff --git a/source/java/org/alfresco/repo/version/NodeServiceImpl.java b/source/java/org/alfresco/repo/version/NodeServiceImpl.java
index bcf6d05df4..b06cbf3277 100644
--- a/source/java/org/alfresco/repo/version/NodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/version/NodeServiceImpl.java
@@ -172,6 +172,15 @@ public class NodeServiceImpl implements NodeService, VersionModel
         return dbNodeService.getNodeStatus(nodeRef);
     }
 
+    /**
+     * Delegates to the <code>NodeService</code> used as the version store implementation
+     */
+    @Override
+    public NodeRef getNodeRef(Long nodeId)
+    {
+        return dbNodeService.getNodeRef(nodeId);
+    }
+
     /**
      * Delegates to the <code>NodeService</code> used as the version store implementation
      */