diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index 3d5e0c6258..4506f69de6 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -19,7 +19,7 @@
     <!--
          Import activation extensions for Multi-Tenancy.
     -->
-    <import resource="classpath:alfresco/mt/mt-base-context.xml"/>
+    <import resource="classpath*:alfresco/mt/mt-*context.xml"/>
     <import resource="classpath*:alfresco/extension/mt/*-context.xml"/>
     
     <!--
diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index 3cc770f437..6a77f1e014 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -387,9 +387,9 @@
 		<property name="NamespaceService">
 			<ref bean="NamespaceService" />
 		</property>
-		<property name="tenantService">
-			<ref bean="tenantService" />
-		</property>
+		<property name="singletonCache">
+            <ref bean="immutableSingletonCache" />
+        </property>
 	</bean>
 
 	<bean id="HomeFolderManager" class="org.springframework.aop.framework.ProxyFactoryBean">
diff --git a/config/alfresco/cache-context.xml b/config/alfresco/cache-context.xml
index 1701cc7ce0..0aa8a210ac 100644
--- a/config/alfresco/cache-context.xml
+++ b/config/alfresco/cache-context.xml
@@ -145,9 +145,10 @@
       <property name="name">
          <value>org.alfresco.cache.node.rootNodesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="50" />
+      <property name="maxCacheSize" value="1000" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
+      <property name="tenantAware" value="false" />
    </bean>
    
    <!-- The cross-transaction shared cache for Root Nodes -->
@@ -1070,7 +1071,7 @@
       <property name="name">
          <value>org.alfresco.resourceBundleBaseNamesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="100" />
+      <property name="maxCacheSize" value="1000" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -1099,7 +1100,7 @@
       <property name="name">
          <value>org.alfresco.loadedResourceBundlesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="100" />
+      <property name="maxCacheSize" value="1000" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -1128,7 +1129,7 @@
       <property name="name">
          <value>org.alfresco.messagesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="100" />
+      <property name="maxCacheSize" value="1000" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -1162,7 +1163,7 @@
       <property name="name">
          <value>org.alfresco.compiledModelsTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="100" />
+      <property name="maxCacheSize" value="1000" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -1191,7 +1192,7 @@
       <property name="name">
          <value>org.alfresco.prefixesTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="100" />
+      <property name="maxCacheSize" value="1000" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -1257,7 +1258,7 @@
       <property name="name">
          <value>org.alfresco.routingContentStoreTransactionalCache</value>
       </property>
-      <property name="maxCacheSize" value="1000" />
+      <property name="maxCacheSize" value="10000" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
    </bean>
@@ -1378,6 +1379,40 @@
       <property name="maxCacheSize" value="100" />
       <property name="mutable" value="true" />
       <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
+      <property name="tenantAware" value="false" />
+   </bean>
+   
+   <!-- ===================================== -->
+   <!-- Immutable Singleton Cache             -->
+   <!-- ===================================== -->
+   
+   <!-- The cross-transaction shared cache for immutable (tenant-aware) singletons -->
+   
+   <bean name="immutableSingletonSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+      <property name="cache">
+         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
+            <property name="cacheManager">
+               <ref bean="internalEHCacheManager" />
+            </property>
+            <property name="cacheName">
+               <value>org.alfresco.cache.immutableSingletonCache</value>
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <!-- The transactional cache for immutable (tenant-aware) singletons -->
+   
+   <bean name="immutableSingletonCache" class="org.alfresco.repo.cache.TransactionalCache">
+      <property name="sharedCache">
+         <ref bean="immutableSingletonSharedCache" />
+      </property>
+      <property name="name">
+         <value>org.alfresco.cache.immutableSingletonTransactionalCache</value>
+      </property>
+      <property name="maxCacheSize" value="12000" />
+      <property name="mutable" value="false" />
+      <property name="disableSharedCache" value="${system.cache.disableImmutableSharedCaches}" />
    </bean>
    
 </beans>
diff --git a/config/alfresco/cmis-api-context.xml b/config/alfresco/cmis-api-context.xml
index 07da53f728..568a337583 100644
--- a/config/alfresco/cmis-api-context.xml
+++ b/config/alfresco/cmis-api-context.xml
@@ -44,9 +44,7 @@
         <property name="CMISMapping">
             <ref bean="CMISMapping" />
         </property>
-        <property name="tenantService">
-            <ref bean="tenantService" />
-        </property>
+        <property name="singletonCache" ref="immutableSingletonCache"/>
     </bean>
     
     <bean id="CMIS.DictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index 985b516203..f9c73f1b76 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -112,6 +112,9 @@
       <property name="ignoreEmptyContent" >
          <value>${policy.content.update.ignoreEmpty}</value>
       </property>
+      <property name="transformerFailover" >
+         <value>${content.transformer.failover}</value>
+      </property>
       <property name="transformerDebug">
          <ref bean="transformerDebug"></ref>
       </property>
@@ -352,22 +355,6 @@
    <bean id="transformer.OOXMLThumbnail"
          class="org.alfresco.repo.content.transform.OOXMLThumbnailContentTransformer"
          parent="baseContentTransformer" >
-      <property name="explicitTransformations">
-         <list>
-            <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails" >
-                <property name="sourceMimetype"><value>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</value></property>
-                <property name="targetMimetype"><value>image/jpeg</value></property>
-            </bean>
-            <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails" >
-                <property name="sourceMimetype"><value>application/vnd.openxmlformats-officedocument.wordprocessingml.document</value></property>
-                <property name="targetMimetype"><value>image/jpeg</value></property>
-            </bean>
-            <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails" >
-                <property name="sourceMimetype"><value>application/vnd.openxmlformats-officedocument.presentationml.presentation</value></property>
-                <property name="targetMimetype"><value>image/jpeg</value></property>
-            </bean>
-         </list>
-      </property>
    </bean>
 
    <bean id="transformer.PdfBox"
@@ -493,22 +480,6 @@
    <bean id="transformer.complex.OOXML.Image"
          class="org.alfresco.repo.content.transform.ComplexContentTransformer"
          parent="baseContentTransformer">
-      <property name="explicitTransformations">
-         <list>
-            <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails" >
-                <property name="sourceMimetype"><value>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</value></property>
-                <property name="targetMimetype"><value>image/png</value></property>
-            </bean>
-            <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails" >
-                <property name="sourceMimetype"><value>application/vnd.openxmlformats-officedocument.wordprocessingml.document</value></property>
-                <property name="targetMimetype"><value>image/png</value></property>
-            </bean>
-            <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails" >
-                <property name="sourceMimetype"><value>application/vnd.openxmlformats-officedocument.presentationml.presentation</value></property>
-                <property name="targetMimetype"><value>image/png</value></property>
-            </bean>
-         </list>
-      </property>  
       <property name="transformers">
          <list>
             <ref bean="transformer.OOXMLThumbnail" />
@@ -536,7 +507,7 @@
             <value>application/pdf</value>
          </list>
       </property>
-      <!-- Note: there are maxSourceSizeKBytes limit on transformer.OpenOffice for xlsx->pdf
+      <!-- Note: there are maxSourceSizeKBytes limits on transformer.OpenOffice transforming to pdf
            which may cause this transformer not to be selected because it is too slow. -->
    </bean>   
 
@@ -656,47 +627,69 @@
          <ref bean="transformer.worker.OpenOffice" />
       </property>
       <property name="mimetypeLimits">
-        <map>
-            <entry key="text/plain">
-                <map>
-                    <!-- Don't use for text to text as there are better options -->
-                    <entry key="text/plain">
-                        <bean class="org.alfresco.service.cmr.repository.TransformationOptionLimits">
-                            <property name="maxSourceSizeKBytes"><value>0</value></property>
-                        </bean>
-                    </entry>
-                    <!-- Don't use for text to pdf (and onwards to swf) if too large -->
-                    <entry key="application/pdf">
-                        <bean class="org.alfresco.service.cmr.repository.TransformationOptionLimits">
-                            <property name="maxSourceSizeKBytes"><value>${content.transformer.OpenOffice.mimeTypeLimits.txt.pdf.maxSourceSizeKBytes}</value></property>
-                        </bean>
-                    </entry>
-                </map>
-            </entry>
-            <!-- Limit use of xlsx to pdf (and onwards to swf) if too large -->
-            <entry key="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
-                <map>
-                    <entry key="application/pdf">
-                        <bean class="org.alfresco.service.cmr.repository.TransformationOptionLimits">
-                            <property name="maxSourceSizeKBytes"><value>${content.transformer.OpenOffice.mimeTypeLimits.xlsx.pdf.maxSourceSizeKBytes}</value></property>
-                        </bean>
-                    </entry>
-                </map>
-            </entry>
-            <!-- Limit use of xls to pdf (and onwards to swf) if too large -->
-            <entry key="application/vnd.ms-excel">
-                <map>
-                    <entry key="application/pdf">
-                        <bean class="org.alfresco.service.cmr.repository.TransformationOptionLimits">
-                            <property name="maxSourceSizeKBytes"><value>${content.transformer.OpenOffice.mimeTypeLimits.xls.pdf.maxSourceSizeKBytes}</value></property>
-                        </bean>
-                    </entry>
-                </map>
-            </entry>
-        </map>
+         <ref bean="transformer.OpenOffice.mimetypeLimits"/>
       </property>
    </bean>
 
+   <!-- Don't use for anything to text as there are better options (TikaAuto, TextMining) -->
+   <!-- Don't use for text to pdf (and onwards to swf) if too large -->
+   <!-- doc and dot use the same mimetype -->
+   <!-- Can only read Microsoft Office 2007 types with the 3.2 version of OpenOffice.  -->
+   <bean id="transformer.OpenOffice.mimetypeLimits" class="org.alfresco.service.cmr.repository.TransformationOptionLimitsMap">
+      <constructor-arg>
+         <value>
+            *    txt  maxSourceSizeKBytes 0 ;
+
+            txt  pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.txt.pdf.maxSourceSizeKBytes}  ;
+            doc  pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.doc.pdf.maxSourceSizeKBytes}  ;
+            docx pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.docx.pdf.maxSourceSizeKBytes} ;
+            docm pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.docm.pdf.maxSourceSizeKBytes} ;
+            dotx pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.dotx.pdf.maxSourceSizeKBytes} ;
+            dotm pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.dotm.pdf.maxSourceSizeKBytes} ;
+            ppt  pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.ppt.pdf.maxSourceSizeKBytes}  ;
+            pptx pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.pptx.pdf.maxSourceSizeKBytes} ;
+            pptm pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.pptm.pdf.maxSourceSizeKBytes} ;
+            ppsx pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.ppsx.pdf.maxSourceSizeKBytes} ;
+            ppsm pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.ppsm.pdf.maxSourceSizeKBytes} ;
+            potx pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.potx.pdf.maxSourceSizeKBytes} ;
+            potm pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.potm.pdf.maxSourceSizeKBytes} ;
+            ppam pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.ppam.pdf.maxSourceSizeKBytes} ;
+            sldx pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.sldx.pdf.maxSourceSizeKBytes} ;
+            sldm pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.sldm.pdf.maxSourceSizeKBytes} ;
+            xls  pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.xls.pdf.maxSourceSizeKBytes}  ;
+            xlsx pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.xlsx.pdf.maxSourceSizeKBytes} ;
+            xltx pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.xltx.pdf.maxSourceSizeKBytes} ;
+            xlsm pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.xlsm.pdf.maxSourceSizeKBytes} ;
+            xltm pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.xltm.pdf.maxSourceSizeKBytes} ;
+            xlam pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.xlam.pdf.maxSourceSizeKBytes} ;
+            xlsb pdf  maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.xlsb.pdf.maxSourceSizeKBytes} ;
+            
+            *    docx maxSourceSizeKBytes 0 ;
+            *    docm maxSourceSizeKBytes 0 ;
+            *    dotx maxSourceSizeKBytes 0 ;
+            *    dotm maxSourceSizeKBytes 0 ;
+            *    pptx maxSourceSizeKBytes 0 ;
+            *    pptm maxSourceSizeKBytes 0 ;
+            *    ppsx maxSourceSizeKBytes 0 ;
+            *    ppsm maxSourceSizeKBytes 0 ;
+            *    potx maxSourceSizeKBytes 0 ;
+            *    potm maxSourceSizeKBytes 0 ;
+            *    ppam maxSourceSizeKBytes 0 ;
+            *    sldx maxSourceSizeKBytes 0 ;
+            *    sldm maxSourceSizeKBytes 0 ;
+            *    xlsx maxSourceSizeKBytes 0 ;
+            *    xltx maxSourceSizeKBytes 0 ;
+            *    xlsm maxSourceSizeKBytes 0 ;
+            *    xltm maxSourceSizeKBytes 0 ;
+            *    xlam maxSourceSizeKBytes 0 ;
+            *    xlsb maxSourceSizeKBytes 0
+         </value>
+      </constructor-arg>
+      <constructor-arg>
+         <ref bean="mimetypeService" />
+      </constructor-arg>
+   </bean>
+         
    <bean id="transformer.complex.OpenOffice.PdfBox"
         class="org.alfresco.repo.content.transform.ComplexContentTransformer"
         parent="baseContentTransformer" >
@@ -712,41 +705,47 @@
          </list>    
       </property>
       <property name="mimetypeLimits">
-        <map>
-            <!-- Don't use for text to text as there are better options -->
-            <entry key="text/plain">
-                <map>
-                    <entry key="text/plain">
-                        <bean class="org.alfresco.service.cmr.repository.TransformationOptionLimits">
-                            <property name="maxSourceSizeKBytes"><value>0</value></property>
-                        </bean>
-                    </entry>
-                </map>
-            </entry>
-            <!-- Don't use for xlsx to text as there are better options -->
-            <entry key="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
-                <map>
-                    <entry key="text/plain">
-                        <bean class="org.alfresco.service.cmr.repository.TransformationOptionLimits">
-                            <property name="maxSourceSizeKBytes"><value>0</value></property>
-                        </bean>
-                    </entry>
-                </map>
-            </entry>
-            <!-- Don't use for xls to text as there are better options -->
-            <entry key="application/vnd.ms-excel">
-                <map>
-                    <entry key="text/plain">
-                        <bean class="org.alfresco.service.cmr.repository.TransformationOptionLimits">
-                            <property name="maxSourceSizeKBytes"><value>0</value></property>
-                        </bean>
-                    </entry>
-                </map>
-            </entry>
-        </map>
+         <ref bean="transformer.complex.OpenOffice.PdfBox.mimetypeLimits"/>
       </property>
+      <!-- Note: there are maxSourceSizeKBytes limits on transformer.OpenOffice transforming to pdf
+           which may cause this transformer not to be selected because it is too slow. -->
    </bean>
-   
+
+   <!-- Don't use for text to text as there are better options -->
+   <!-- Don't use for Microsoft formats to text as there are better options -->
+   <bean id="transformer.complex.OpenOffice.PdfBox.mimetypeLimits" class="org.alfresco.service.cmr.repository.TransformationOptionLimitsMap">
+      <constructor-arg>
+         <value>
+            txt  txt  maxSourceSizeKBytes 0 ;
+            doc  txt  maxSourceSizeKBytes 0 ;
+            docx txt  maxSourceSizeKBytes 0 ;
+            docm txt  maxSourceSizeKBytes 0 ;
+            dotx txt  maxSourceSizeKBytes 0 ;
+            dotm txt  maxSourceSizeKBytes 0 ;
+            ppt  txt  maxSourceSizeKBytes 0 ;
+            pptx txt  maxSourceSizeKBytes 0 ;
+            pptm txt  maxSourceSizeKBytes 0 ;
+            ppsx txt  maxSourceSizeKBytes 0 ;
+            ppsm txt  maxSourceSizeKBytes 0 ;
+            potx txt  maxSourceSizeKBytes 0 ;
+            potm txt  maxSourceSizeKBytes ${content.transformer.OpenOffice.PdfBox.mimeTypeLimits.potm.txt.maxSourceSizeKBytes} ;
+            ppam txt  maxSourceSizeKBytes 0 ;
+            sldx txt  maxSourceSizeKBytes 0 ;
+            sldm txt  maxSourceSizeKBytes 0 ;
+            xls  txt  maxSourceSizeKBytes 0 ;
+            xlsx txt  maxSourceSizeKBytes 0 ;
+            xltx txt  maxSourceSizeKBytes 0 ;
+            xlsm txt  maxSourceSizeKBytes 0 ;
+            xltm txt  maxSourceSizeKBytes 0 ;
+            xlam txt  maxSourceSizeKBytes 0 ;
+            xlsb txt  maxSourceSizeKBytes ${content.transformer.OpenOffice.PdfBox.mimeTypeLimits.xlsb.txt.maxSourceSizeKBytes}
+         </value>
+      </constructor-arg>
+      <constructor-arg>
+         <ref bean="mimetypeService" />
+      </constructor-arg>
+   </bean>
+
    <bean id="transformer.OutlookMsg"
          class="org.alfresco.repo.content.transform.MailContentTransformer"
          parent="baseContentTransformer" />
diff --git a/config/alfresco/dao/dao-context.xml b/config/alfresco/dao/dao-context.xml
index e33d1262b0..f1f8a5df5e 100644
--- a/config/alfresco/dao/dao-context.xml
+++ b/config/alfresco/dao/dao-context.xml
@@ -123,6 +123,7 @@
       <property name="childByNameCache" ref="node.childByNameCache"/>
    </bean>
    <bean id="nodeDAO.org.hibernate.dialect.Dialect" class="org.alfresco.repo.domain.node.ibatis.NodeDAOImpl" parent="nodeDAObase" />
+   <bean id="nodeDAO.org.hibernate.dialect.MySQLInnoDBDialect" class="org.alfresco.repo.domain.node.ibatis.NodeDAOImpl$MySQL" parent="nodeDAO.org.hibernate.dialect.Dialect" />
    <bean id="nodeDAO.org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect" class="org.alfresco.repo.domain.node.ibatis.NodeDAOImpl$MSSQL" parent="nodeDAO.org.hibernate.dialect.Dialect" />
    
    <bean id="lockDAO" class="org.alfresco.repo.domain.locks.ibatis.LockDAOImpl">
diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
index f86e436319..06957ccff8 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
+++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
@@ -2420,6 +2420,47 @@
         </index>
       </indexes>
     </table>
+    <table name="alf_tenant">
+      <columns>
+        <column name="tenant_domain" order="1">
+          <type>varchar(75)</type>
+          <nullable>false</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="version" order="2">
+          <type>bigint</type>
+          <nullable>false</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="enabled" order="3">
+          <type>bit</type>
+          <nullable>false</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="tenant_name" order="4">
+          <type>varchar(75)</type>
+          <nullable>true</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="content_root" order="5">
+          <type>varchar(255)</type>
+          <nullable>true</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="db_url" order="6">
+          <type>varchar(255)</type>
+          <nullable>true</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+      </columns>
+      <primarykey name="PRIMARY">
+        <columnnames>
+          <columnname order="1">id</columnname>
+        </columnnames>
+      </primarykey>
+      <foreignkeys/>
+      <indexes/>
+    </table>
     <table name="alf_transaction">
       <columns>
         <column name="id" order="1">
diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
index 6106270b46..e1dc8fbdf1 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
+++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
@@ -2457,6 +2457,47 @@
         </index>
       </indexes>
     </table>
+    <table name="alf_tenant">
+      <columns>
+        <column name="tenant_domain" order="1">
+          <type>varchar(75)</type>
+          <nullable>false</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="version" order="2">
+          <type>int8</type>
+          <nullable>false</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="enabled" order="3">
+          <type>bit</type>
+          <nullable>false</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="tenant_name" order="4">
+          <type>varchar(75)</type>
+          <nullable>true</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="content_root" order="5">
+          <type>varchar(255)</type>
+          <nullable>true</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+        <column name="db_url" order="6">
+          <type>varchar(255)</type>
+          <nullable>true</nullable>
+          <autoincrement>false</autoincrement>
+        </column>
+      </columns>
+      <primarykey name="PRIMARY">
+        <columnnames>
+          <columnname order="1">id</columnname>
+        </columnnames>
+      </primarykey>
+      <foreignkeys/>
+      <indexes/>
+    </table>
     <table name="alf_transaction">
       <columns>
         <column name="id" order="1">
diff --git a/config/alfresco/ehcache-default.xml b/config/alfresco/ehcache-default.xml
index 7e81230736..8376ab6b42 100644
--- a/config/alfresco/ehcache-default.xml
+++ b/config/alfresco/ehcache-default.xml
@@ -40,14 +40,14 @@
     
     <cache 
         name="org.alfresco.cache.node.rootNodesCache" 
-        maxElementsInMemory="500"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
         />
     <cache 
         name="org.alfresco.cache.node.allRootNodesCache" 
-        maxElementsInMemory="500"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -275,7 +275,7 @@
         
     <cache 
         name="org.alfresco.cache.globalConfigCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -285,7 +285,7 @@
     
     <cache
         name="org.alfresco.cache.resourceBundleBaseNamesCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -293,7 +293,7 @@
         
     <cache 
         name="org.alfresco.cache.loadedResourceBundlesCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -301,7 +301,7 @@
         
     <cache 
         name="org.alfresco.cache.messagesCache"
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -312,7 +312,7 @@
     <!-- dictionary models -->
     <cache 
         name="org.alfresco.cache.compiledModelsCache" 
-        maxElementsInMemory="10000"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -321,7 +321,7 @@
 	<!-- dictionary namespaces -->
     <cache 
         name="org.alfresco.cache.prefixesCache" 
-        maxElementsInMemory="10000"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -331,7 +331,7 @@
     
     <cache 
         name="org.alfresco.cache.tenantEntityCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -346,8 +346,8 @@
         overflowToDisk="false"
         statistics="false"
         />
-        
-    <!-- Web Scripts Registry -->
+
+    <!-- Web Scripts Registry (tenant-based) -->
     
     <cache 
         name="org.alfresco.cache.webScriptsRegistryCache"
@@ -396,4 +396,15 @@
         statistics="false"
         timeToLiveSeconds="60"
         />
+        
+    <!-- Immutable (tenant-aware) Singletons -->
+    
+    <cache 
+        name="org.alfresco.cache.immutableSingletonCache"
+        maxElementsInMemory="12000"
+        eternal="true"
+        overflowToDisk="false"
+        statistics="false"
+        />
+        
 </ehcache>
diff --git a/config/alfresco/extension/ehcache-custom.xml.sample.cluster b/config/alfresco/extension/ehcache-custom.xml.sample.cluster
index b9f04195eb..2863383ad5 100644
--- a/config/alfresco/extension/ehcache-custom.xml.sample.cluster
+++ b/config/alfresco/extension/ehcache-custom.xml.sample.cluster
@@ -87,7 +87,7 @@
 
     <cache
         name="org.alfresco.cache.node.rootNodesCache"
-        maxElementsInMemory="500"
+        maxElementsInMemory="1000"
         eternal="true"
         timeToIdleSeconds="0"
         timeToLiveSeconds="0"
@@ -106,7 +106,7 @@
 
     <cache
         name="org.alfresco.cache.node.allRootNodesCache"
-        maxElementsInMemory="500"
+        maxElementsInMemory="1000"
         eternal="true"
         timeToIdleSeconds="0"
         timeToLiveSeconds="0"
@@ -569,7 +569,7 @@
         
     <cache 
         name="org.alfresco.cache.globalConfigCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -589,7 +589,7 @@
     
     <cache
         name="org.alfresco.cache.resourceBundleBaseNamesCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -607,7 +607,7 @@
         
     <cache 
         name="org.alfresco.cache.loadedResourceBundlesCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -625,7 +625,7 @@
         
     <cache 
         name="org.alfresco.cache.messagesCache"
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -645,7 +645,7 @@
     
     <cache 
         name="org.alfresco.cache.compiledModelsCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -663,7 +663,7 @@
     
     <cache 
         name="org.alfresco.cache.prefixesCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -684,7 +684,7 @@
     
     <cache 
         name="org.alfresco.cache.tenantsCache" 
-        maxElementsInMemory="100"
+        maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="false"
         statistics="false"
@@ -699,26 +699,7 @@
                                  replicateAsynchronously = false"/>
 
     </cache>
-
-    <!-- Tenant-based Routing File Content Store -->
     
-    <cache 
-        name="org.alfresco.cache.tenantFileStoresCache"
-        maxElementsInMemory="10000"
-        eternal="true"
-        overflowToDisk="false"
-        statistics="false"
-        >
-        
-             <cacheEventListenerFactory
-                     class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-                     properties="replicatePuts = false,
-                                 replicateUpdates = true,
-                                 replicateRemovals = true,
-                                 replicateUpdatesViaCopy = false,
-                                 replicateAsynchronously = false"/>
-
-    </cache>
          
     <!-- Web Scripts Registry -->
     
diff --git a/config/alfresco/extension/mt/mt-admin-context.xml.sample b/config/alfresco/extension/mt/mt-admin-context.xml.sample
deleted file mode 100644
index d492032b1b..0000000000
--- a/config/alfresco/extension/mt/mt-admin-context.xml.sample
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-
-    <!--
-        Bootstrap Data: Prototype beans for the per-tenant bootstrap.
-        These are fetched by the MultiTAdminServiceImpl when new tenant is created.
-    -->
-    <bean id="userBootstrap-mt" parent="userBootstrap-base" singleton="false" />
-    <bean id="systemBootstrap-mt" parent="systemBootstrap-base" singleton="false" />
-    <bean id="versionBootstrap-mt" parent="versionBootstrap-base" singleton="false" />
-    <bean id="version2Bootstrap-mt" parent="version2Bootstrap-base" singleton="false" />
-    <bean id="spacesArchiveBootstrap-mt" parent="spacesArchiveBootstrap-base" singleton="false" />
-    <bean id="spacesBootstrap-mt" parent="spacesBootstrap-base" singleton="false" />
-    
-    <!--                                           -->
-    <!-- MT Admin Service Implementation -->
-    <!--                                           -->
-    
-    <bean id="tenantAdminService" parent="baseMultiTAdminService" class="org.alfresco.repo.tenant.MultiTAdminServiceImpl" />
-    
-    <bean id="tenantInterpreter" class="org.alfresco.repo.tenant.TenantInterpreter" parent="interpreterBase">
-        <property name="tenantAdminService" ref="tenantAdminService"/>
-        <property name="tenantService" ref="tenantService"/>
-        <property name="authenticationService" ref="AuthenticationService"/>
-        <property name="baseAdminUsername"><value>${alfresco_user_store.adminusername}</value></property>
-    </bean>
-    
-    <bean id="tenantInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
-        <property name="resourceBundles">
-            <list>
-                <value>alfresco.messages.tenant-interpreter-help</value>
-            </list>
-        </property>
-    </bean>
-   
-</beans>
diff --git a/config/alfresco/extension/mt/mt-contentstore-context.xml.sample b/config/alfresco/extension/mt/mt-contentstore-context.xml.sample
deleted file mode 100644
index 8366256327..0000000000
--- a/config/alfresco/extension/mt/mt-contentstore-context.xml.sample
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-
-   <!--                                      -->
-   <!-- (Tenant Routing) File Content Store  -->
-   <!--                                      -->
-   
-   <bean id="fileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" parent="baseTenantRoutingContentStore">
-      <property name="defaultRootDir" value="${dir.contentstore}" />
-   </bean>
-   
-</beans>
diff --git a/config/alfresco/extension/mt/mt-context.xml.sample b/config/alfresco/extension/mt/mt-context.xml.sample
deleted file mode 100644
index 1ddff452ba..0000000000
--- a/config/alfresco/extension/mt/mt-context.xml.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-   
-   <!--                           -->
-   <!-- MT Service Implementation -->
-   <!--                           -->
-   
-   <bean id="tenantService" class="org.alfresco.repo.tenant.MultiTServiceImpl">
-   
-      <property name="tenantAdminDAO">
-         <ref bean="tenantAdminDAO"/>
-      </property>
-      
-   </bean>
-       
-</beans>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
index e9a60d6a57..1f1e7b0e00 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
@@ -927,7 +927,6 @@
 
     <sql id="select_ChildAssoc_OrderBy">
         order by
-            assoc.assoc_index ASC,
             assoc.id ASC
     </sql>
     <sql id="select_ChildAssocsOfParent_Query">
@@ -1288,6 +1287,18 @@
         <![CDATA[and commit_time_ms <= #{maxCommitTime}]]>
     </delete>
 
+    <delete id="delete_Txns_Unused_MySQL" parameterType="TransactionQuery">
+        delete
+            txn
+        from
+            alf_transaction txn
+            left join alf_node n on (txn.id = n.transaction_id)
+        where
+            n.id is null        
+            <![CDATA[and txn.commit_time_ms >= #{minCommitTime}]]>
+            <![CDATA[and txn.commit_time_ms <= #{maxCommitTime}]]>
+    </delete>
+
     <select id="select_TxnCount" resultType="java.lang.Integer">
         select
             count(txn.id)
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/tenants-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/tenants-common-SqlMap.xml
index 75cd6ae2ea..bd78d9fef3 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/tenants-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/tenants-common-SqlMap.xml
@@ -11,12 +11,12 @@
     <!--                -->
     
     <resultMap id="result_Tenant" type="Tenant">
-        <result property="tenantDomain" column="tenant_domain" jdbcType="VARCHAR" javaType="string"/>
-        <result property="version" column="version" jdbcType="BIGINT" javaType="long"/>
-        <result property="enabled" column="enabled" jdbcType="BIT" javaType="boolean"/>
-        <result property="tenantName" column="tenant_name" jdbcType="VARCHAR" javaType="string"/>
-        <result property="contentRoot" column="content_root" jdbcType="VARCHAR" javaType="string"/>
-        <result property="dbUrl" column="db_url" jdbcType="VARCHAR" javaType="string"/>
+        <result property="tenantDomain" column="tenant_domain" jdbcType="VARCHAR" javaType="java.lang.String"/>
+        <result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="enabled" column="enabled" jdbcType="BIT" javaType="java.lang.Boolean"/>
+        <result property="tenantName" column="tenant_name" jdbcType="VARCHAR" javaType="java.lang.String"/>
+        <result property="contentRoot" column="content_root" jdbcType="VARCHAR" javaType="java.lang.String"/>
+        <result property="dbUrl" column="db_url" jdbcType="VARCHAR" javaType="java.lang.String"/>
     </resultMap>
     
     <!--                -->
diff --git a/config/alfresco/messages/invitation-service_de.properties b/config/alfresco/messages/invitation-service_de.properties
index 41087b2bc3..9dc7d9cf2f 100755
--- a/config/alfresco/messages/invitation-service_de.properties
+++ b/config/alfresco/messages/invitation-service_de.properties
@@ -6,7 +6,7 @@ invitation.error.noworkflow="Einladungsworkflow wurde nicht gefunden, Name des W
 invitation.error.not_found="Einladung nicht gefunden, Einladungs-ID: {0}"
 invitation.error.invalid_inviteId_format="Einladungs-ID hat ung\u00fcltiges Format, g\u00fcltige Formate sind <engine>$<id>: {0}"
 invitation.invite.already_member="Der Benutzer {0} ist bereits Mitglied von {1} und kann nicht noch einmal eingeladen werden"
-invitation.cancel.not_site_manager="Aktueller Benutzer {0} kann Einladung: {1} nicht abbrechen, da sie nicht Site Manger f\u00fcr Site: {2} sind"
+invitation.cancel.not_site_manager="Aktueller Benutzer {0} kann Einladung: {1} nicht abbrechen, da sie nicht Site Manager f\u00fcr Site: {2} sind"
 invitation.invite.not_site_manager="Aktueller Benutzer {0} ist kein Site Manager f\u00fcr Site: {1}"
 invitation.invite.unable_generate_id="Kann keinen Benutzernamen f\u00fcr Eingeladenen generieren, der nicht schon jemand anderem geh\u00f6rt Vorname: {0} Nachname: {1} E-Mail: {2}"
 invitation.invite.already_finished="Einladung {0} wurde bereits angenommen, abgebrochen oder abgelehnt"
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 64e510e1b6..bde9bbd26a 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -153,6 +153,7 @@ patch.siteLoadPatch.exists=The Site {0} already exists and so could not be impor
 patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
 patch.siteLoadPatch.result=Site {0} imported.
 patch.siteLoadPatch.siteNotCreated=The site {0} is only created for new installs.
+patch.siteLoadPatch.siteLoadDisabled=The load of site {0} is disabled.
 
 patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
 patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
diff --git a/config/alfresco/mimetype/openoffice-document-formats.xml b/config/alfresco/mimetype/openoffice-document-formats.xml
index 21e5273c5e..fc4476f369 100644
--- a/config/alfresco/mimetype/openoffice-document-formats.xml
+++ b/config/alfresco/mimetype/openoffice-document-formats.xml
@@ -75,6 +75,33 @@
     </export-filters>
   </document-format>
 
+  <document-format><name>Microsoft Word 2007 macro-enabled document</name>
+    <family>Text</family>
+    <mime-type>application/vnd.ms-word.document.macroEnabled.12</mime-type>
+    <file-extension>docm</file-extension>
+    <export-filters>
+      <entry><family>Text</family><string>MS Word 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <document-format><name>Microsoft Word template 2007</name>
+    <family>Text</family>
+    <mime-type>application/vnd.openxmlformats-officedocument.wordprocessingml.template</mime-type>
+    <file-extension>dotx</file-extension>
+    <export-filters>
+      <entry><family>Text</family><string>MS Word 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <document-format><name>Microsoft Word 2007 macro-enabled document template</name>
+    <family>Text</family>
+    <mime-type>application/vnd.ms-word.template.macroEnabled.12</mime-type>
+    <file-extension>dotm</file-extension>
+    <export-filters>
+      <entry><family>Text</family><string>MS Word 2007</string></entry>
+    </export-filters>
+  </document-format>
+
   <document-format><name>WordPerfect</name>
     <family>Text</family>
     <mime-type>application/wordperfect</mime-type>
@@ -140,6 +167,53 @@
     </export-filters>
   </document-format>
 
+  <document-format><name>Microsoft Excel template 2007</name>
+    <family>Spreadsheet</family>
+    <mime-type>application/vnd.openxmlformats-officedocument.spreadsheetml.template</mime-type>
+    <file-extension>xltx</file-extension>
+    <export-filters>
+      <entry><family>Spreadsheet</family><string>MS Excel 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <document-format><name>Microsoft Excel 2007 macro-enabled workbook</name>
+    <family>Spreadsheet</family>
+    <mime-type>application/vnd.ms-excel.sheet.macroEnabled.12</mime-type>
+    <file-extension>xlsm</file-extension>
+    <export-filters>
+      <entry><family>Spreadsheet</family><string>MS Excel 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <document-format><name>Microsoft Excel 2007 macro-enabled workbook template</name>
+    <family>Spreadsheet</family>
+    <mime-type>application/vnd.ms-excel.template.macroEnabled.12</mime-type>
+    <file-extension>xltm</file-extension>
+    <export-filters>
+      <entry><family>Spreadsheet</family><string>MS Excel 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <!-- Not supported in OpenOffice 3.2 (might be in later versions)
+  <document-format><name>Microsoft Excel 2007 add-in</name>
+    <family>Spreadsheet</family>
+    <mime-type>application/vnd.ms-excel.addin.macroEnabled.12</mime-type>
+    <file-extension>xlam</file-extension>
+    <export-filters>
+      <entry><family>Spreadsheet</family><string>MS Excel 2007</string></entry>
+    </export-filters>
+  </document-format>
+  -->
+
+  <document-format><name>Microsoft Excel 2007 binary workbook</name>
+    <family>Spreadsheet</family>
+    <mime-type>application/vnd.ms-excel.sheet.binary.macroEnabled.12</mime-type>
+    <file-extension>xlsb</file-extension>
+    <export-filters>
+      <entry><family>Spreadsheet</family><string>MS Excel 2007</string></entry>
+    </export-filters>
+  </document-format>
+
   <!-- Not properly supported by OpenOffice via the Java API -->
 <!--
   <document-format><name>Comma Separated Values (CSV)</name>
@@ -182,7 +256,7 @@
     </export-filters>
   </document-format>
 
-  <document-format><name>Microsoft PowerPoint 2007</name>
+  <document-format><name>Microsoft PowerPoint 2007 presentation</name>
     <family>Presentation</family>
     <mime-type>application/vnd.openxmlformats-officedocument.presentationml.presentation</mime-type>
     <file-extension>pptx</file-extension>
@@ -191,4 +265,80 @@
     </export-filters>
   </document-format>
 
+  <document-format><name>Microsoft owerPoint 2007 macro-enabled presentation</name>
+    <family>Presentation</family>
+    <mime-type>application/vnd.ms-powerpoint.presentation.macroEnabled.12</mime-type>
+    <file-extension>pptm</file-extension>
+    <export-filters>
+      <entry><family>Presentation</family><string>MS PowerPoint 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <!-- Not supported in OpenOffice 3.2 (might be in later versions)
+  <document-format><name>Microsoft PowerPoint 2007 slide show</name>
+    <family>Presentation</family>
+    <mime-type>application/vnd.openxmlformats-officedocument.presentationml.slideshow</mime-type>
+    <file-extension>ppsx</file-extension>
+    <export-filters>
+      <entry><family>Presentation</family><string>MS PowerPoint 2007</string></entry>
+    </export-filters>
+  </document-format>
+  -->
+  
+  <!-- Not supported in OpenOffice 3.2 (might be in later versions)
+  <document-format><name>Microsoft PowerPoint 2007 macro-enabled slide show</name>
+    <family>Presentation</family>
+    <mime-type>application/vnd.ms-powerpoint.slideshow.macroEnabled.12</mime-type>
+    <file-extension>ppsm</file-extension>
+    <export-filters>
+      <entry><family>Presentation</family><string>MS PowerPoint 2007</string></entry>
+    </export-filters>
+  </document-format>
+  -->
+
+  <document-format><name>Microsoft PowerPoint 2007 template</name>
+    <family>Presentation</family>
+    <mime-type>application/vnd.openxmlformats-officedocument.presentationml.template</mime-type>
+    <file-extension>potx</file-extension>
+    <export-filters>
+      <entry><family>Presentation</family><string>MS PowerPoint 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <document-format><name>Microsoft PowerPoint 2007 macro-enabled presentation template</name>
+    <family>Presentation</family>
+    <mime-type>application/vnd.ms-powerpoint.template.macroEnabled.12</mime-type>
+    <file-extension>potm</file-extension>
+    <export-filters>
+      <entry><family>Presentation</family><string>MS PowerPoint 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <document-format><name>Microsoft PowerPoint 2007 add-in</name>
+    <family>Presentation</family>
+    <mime-type>application/vnd.ms-powerpoint.addin.macroEnabled.12</mime-type>
+    <file-extension>ppam</file-extension>
+    <export-filters>
+      <entry><family>Presentation</family><string>MS PowerPoint 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <document-format><name>Microsoft PowerPoint 2007 slide</name>
+    <family>Presentation</family>
+    <mime-type>application/vnd.openxmlformats-officedocument.presentationml.slide</mime-type>
+    <file-extension>sldx</file-extension>
+    <export-filters>
+      <entry><family>Presentation</family><string>MS PowerPoint 2007</string></entry>
+    </export-filters>
+  </document-format>
+
+  <document-format><name>Microsoft PowerPoint 2007 macro-enabled slide</name>
+    <family>Presentation</family>
+    <mime-type>application/vnd.ms-powerpoint.slideshow.macroEnabled.12</mime-type>
+    <file-extension>sldm</file-extension>
+    <export-filters>
+      <entry><family>Presentation</family><string>MS PowerPoint 2007</string></entry>
+    </export-filters>
+  </document-format>
+
 </document-formats>
diff --git a/config/alfresco/model/datalistModel.xml b/config/alfresco/model/datalistModel.xml
index 2c812551a4..f7a2a8ff7f 100644
--- a/config/alfresco/model/datalistModel.xml
+++ b/config/alfresco/model/datalistModel.xml
@@ -271,7 +271,7 @@
          </properties>
       </type>
 
-      <!-- Data List - Contact List -->
+      <!-- Data List - Issue List -->
       <type name="dl:issue">
          <title>Issues List</title>
          <parent>dl:dataListItem</parent>
@@ -363,7 +363,7 @@
          </mandatory-aspects>
       </type>
 
-      <!-- Data List - Event List -->
+      <!-- Data List - Location List -->
       <type name="dl:location">
          <title>Location</title>
          <parent>dl:dataListItem</parent>
@@ -491,4 +491,4 @@
 
    </aspects>
 
-</model>
\ No newline at end of file
+</model>
diff --git a/config/alfresco/extension/mt/mt-admin-context.xml b/config/alfresco/mt/mt-admin-context.xml
similarity index 100%
rename from config/alfresco/extension/mt/mt-admin-context.xml
rename to config/alfresco/mt/mt-admin-context.xml
diff --git a/config/alfresco/mt/mt-base-context.xml b/config/alfresco/mt/mt-base-context.xml
index f142206b53..217a420718 100644
--- a/config/alfresco/mt/mt-base-context.xml
+++ b/config/alfresco/mt/mt-base-context.xml
@@ -35,9 +35,11 @@
       <property name="thumbnailRegistry" ref="thumbnailRegistry"/>
    </bean>
    
-   <bean id="baseTenantRoutingContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" abstract="true">
+   <bean id="baseTenantRoutingContentStore" class="org.alfresco.repo.tenant.AbstractTenantRoutingContentStore" abstract="true">
       <property name="tenantService" ref="tenantService" />
+      <property name="tenantAdminDAO" ref="tenantAdminDAO" />
       <property name="storesCache" ref="routingContentStoreCache" />
+      <property name="singletonCache" ref="immutableSingletonCache"/>
    </bean>
    
 </beans>
diff --git a/config/alfresco/extension/mt/mt-contentstore-context.xml b/config/alfresco/mt/mt-contentstore-context.xml
similarity index 72%
rename from config/alfresco/extension/mt/mt-contentstore-context.xml
rename to config/alfresco/mt/mt-contentstore-context.xml
index 8366256327..eee37fd75e 100644
--- a/config/alfresco/extension/mt/mt-contentstore-context.xml
+++ b/config/alfresco/mt/mt-contentstore-context.xml
@@ -7,7 +7,7 @@
    <!-- (Tenant Routing) File Content Store  -->
    <!--                                      -->
    
-   <bean id="fileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" parent="baseTenantRoutingContentStore">
+   <bean id="fileContentStore" class="org.alfresco.repo.tenant.TenantRoutingFileContentStore" parent="baseTenantRoutingContentStore">
       <property name="defaultRootDir" value="${dir.contentstore}" />
    </bean>
    
diff --git a/config/alfresco/extension/mt/mt-context.xml b/config/alfresco/mt/mt-context.xml
similarity index 100%
rename from config/alfresco/extension/mt/mt-context.xml
rename to config/alfresco/mt/mt-context.xml
diff --git a/config/alfresco/opencmis-context.xml b/config/alfresco/opencmis-context.xml
index 34f159c8d5..b9e1c75e08 100644
--- a/config/alfresco/opencmis-context.xml
+++ b/config/alfresco/opencmis-context.xml
@@ -19,7 +19,7 @@
         <property name="cmisMapping"                  ref="OpenCMISMapping" />
         <property name="dictionaryService"            ref="dictionaryService" />
         <property name="dictionaryDAO"                ref="dictionaryDAO" />
-        <property name="tenantService"                ref="tenantService" />
+        <property name="singletonCache"               ref="immutableSingletonCache"/>
         <property name="propertyLuceneBuilderMapping" ref="OpenCMISPropertyLuceneBuilderMapping" />
         <property name="propertyAccessorMapping"      ref="OpenCMISPropertyAccessorMapping" />
     </bean>
@@ -96,6 +96,7 @@
         <property name="contentService"         ref="ContentService" />
         <property name="renditionService"       ref="RenditionService" />
         <property name="tenantAdminService"     ref="tenantAdminService" />
+        <property name="singletonCache"         ref="immutableSingletonCache" />
         <property name="transactionService"     ref="transactionService"/>
         <property name="authenticationService"  ref="authenticationService" />
         <property name="permissionService"      ref="PermissionService" />
@@ -105,6 +106,7 @@
         <property name="namespaceService"       ref="namespaceService" />
         <property name="searchService"          ref="SearchService" />
         <property name="dictionaryService"      ref="DictionaryService" />
+        <property name="behaviourFilter"        ref="policyBehaviourFilter" />
     </bean>
     
     <bean id="OpenCMISQueryService" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 5bc3a12d5a..dee90e59f3 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2566,6 +2566,7 @@
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>${version.schema}</value></property>
         <property name="targetSchema"><value>10000</value></property>
+        <property name="disabled"><value>${sample.site.disabled}</value></property>
         <property name="dependsOn" >
             <list>
                 <ref bean="patch.updateDmPermissions" />
@@ -3155,4 +3156,23 @@
         </property>
     </bean>
 
+    <bean id="patch.migrateTenantsFromAttrsToTable" class="org.alfresco.repo.admin.patch.impl.MigrateTenantsFromAttrsToTablePatch" parent="basePatch">
+        <property name="id"><value>patch.migrateTenantsFromAttrsToTable</value></property>
+        <property name="description"><value>patch.migrateTenantsFromAttrsToTable.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>6006</value></property>
+        <property name="targetSchema"><value>6007</value></property>
+        <property name="applyToTenants"><value>false</value></property>
+        <property name="attributeService">
+            <ref bean="attributeService"/>
+        </property>
+        <property name="tenantAdminDAO">
+            <ref bean="tenantAdminDAO"/>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V4.0-TenantTables"/>
+            </list>
+        </property>
+    </bean>
 </beans>
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index c9a8db9ef5..47e5de9071 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -251,7 +251,7 @@ system.content.contentUrlConverter.runAsScheduledJob=false
 # Millisecond threshold for text transformations
 # Slower transformers will force the text extraction to be asynchronous
 #
-lucene.maxAtomicTransformationTime=20
+lucene.maxAtomicTransformationTime=100
 #
 # The maximum number of clauses that are allowed in a lucene query 
 #
@@ -614,6 +614,7 @@ system.thumbnail.quietPeriod=604800
 system.thumbnail.quietPeriodRetriesEnabled=true
 
 # Content Transformers
+content.transformer.failover=true
 
 # Base setting for all transformers (2 min timeout)
 content.transformer.default.timeoutMs=120000
@@ -626,27 +627,71 @@ content.transformer.default.maxPages=-1
 # text -> pdf using PdfBox (txt=text/*) 10M takes about 12 seconds
 content.transformer.PdfBox.TextToPdf.maxSourceSizeKBytes=10240
 
-# pdf -> swf using Pdf2swf 1M takes about 30 seconds.
-# Using a value of 1.25M (a bit larger that the txt or xlsx) used to create
-# the pdf on the way to swf to avoid the second part of a transform failing
-content.transformer.Pdf2swf.maxSourceSizeKBytes=1152
+# pdf -> swf using Pdf2swf 2M takes about 60 seconds.
+content.transformer.Pdf2swf.maxSourceSizeKBytes=2048
 
 # txt -> pdf -> swf 1M (pdf is about the same size as the txt)
 # Need this limit as transformer.PdfBox txt -> pdf is allowed up to 10M
-# unlike transformer.OpenOffice and transformer.JodConverter which
-# also only allow 1M text
 content.transformer.complex.Text.Pdf2swf.maxSourceSizeKBytes=1024
 
-# Limits for specific mimetype transformations (txt=text/plain only) 1M
-# Has implication for Share preview which generally goes via pdf to get to swf
+# Transforms to PDF
+# =================
 content.transformer.OpenOffice.mimeTypeLimits.txt.pdf.maxSourceSizeKBytes=1024
-content.transformer.OpenOffice.mimeTypeLimits.xlsx.pdf.maxSourceSizeKBytes=1024
-content.transformer.OpenOffice.mimeTypeLimits.xls.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.doc.pdf.maxSourceSizeKBytes=10240
+content.transformer.OpenOffice.mimeTypeLimits.docx.pdf.maxSourceSizeKBytes=768
+content.transformer.OpenOffice.mimeTypeLimits.docm.pdf.maxSourceSizeKBytes=768
+content.transformer.OpenOffice.mimeTypeLimits.dotx.pdf.maxSourceSizeKBytes=768
+content.transformer.OpenOffice.mimeTypeLimits.dotm.pdf.maxSourceSizeKBytes=768
+content.transformer.OpenOffice.mimeTypeLimits.ppt.pdf.maxSourceSizeKBytes=2048
+content.transformer.OpenOffice.mimeTypeLimits.pptx.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.pptm.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.ppsx.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.ppsm.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.potx.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.potm.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.ppam.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.sldx.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.sldm.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.xls.pdf.maxSourceSizeKBytes=-10240
+content.transformer.OpenOffice.mimeTypeLimits.xlsx.pdf.maxSourceSizeKBytes=1536
+content.transformer.OpenOffice.mimeTypeLimits.xltx.pdf.maxSourceSizeKBytes=1536
+content.transformer.OpenOffice.mimeTypeLimits.xlsm.pdf.maxSourceSizeKBytes=1536
+content.transformer.OpenOffice.mimeTypeLimits.xltm.pdf.maxSourceSizeKBytes=1536
+content.transformer.OpenOffice.mimeTypeLimits.xlam.pdf.maxSourceSizeKBytes=1536
+content.transformer.OpenOffice.mimeTypeLimits.xlsb.pdf.maxSourceSizeKBytes=1536
 
-content.transformer.JodConverter.mimeTypeLimits.txt.pdf.maxSourceSizeKBytes=1024
-content.transformer.JodConverter.mimeTypeLimits.xlsx.pdf.maxSourceSizeKBytes=1024
-content.transformer.JodConverter.mimeTypeLimits.xls.pdf.maxSourceSizeKBytes=1024
+# Transforms to SWF
+# =================
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.doc.swf.maxSourceSizeKBytes=1536
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.docx.swf.maxSourceSizeKBytes=256
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.docm.swf.maxSourceSizeKBytes=256
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.dotx.swf.maxSourceSizeKBytes=256
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.dotm.swf.maxSourceSizeKBytes=256
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.ppt.swf.maxSourceSizeKBytes=768
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.pptx.swf.maxSourceSizeKBytes=512
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.pptm.swf.maxSourceSizeKBytes=512
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.ppsx.swf.maxSourceSizeKBytes=512
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.ppsm.swf.maxSourceSizeKBytes=512
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.potx.swf.maxSourceSizeKBytes=512
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.potm.swf.maxSourceSizeKBytes=512
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.ppam.swf.maxSourceSizeKBytes=512
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.sldx.swf.maxSourceSizeKBytes=512
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.sldm.swf.maxSourceSizeKBytes=512
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xls.swf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xlsx.swf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xltx.swf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xlsm.swf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xltm.swf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xlam.swf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xlsb.swf.maxSourceSizeKBytes=1024
 
+
+# OpenOffice transforms to TXT (generally there are better options such as Tika)
+# =============================
+content.transformer.OpenOffice.PdfBox.mimeTypeLimits.xlsb.txt.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.PdfBox.mimeTypeLimits.potm.txt.maxSourceSizeKBytes=1024
+
+
 # Property to enable upgrade from 2.1-A
 V2.1-A.fixes.to.schema=0
 #V2.1-A.fixes.to.schema=82
@@ -925,3 +970,8 @@ fileFolderService.checkHidden.enabled=true
 
 
 ticket.cleanup.cronExpression=0 0 * * * ?
+
+#
+# Disable load of sample site
+#
+sample.site.disabled=false
\ No newline at end of file
diff --git a/config/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication-context.xml b/config/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication-context.xml
index 25aa568697..e8f1b6cfb9 100644
--- a/config/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication-context.xml
+++ b/config/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication-context.xml
@@ -84,6 +84,7 @@
       <property name="passwordEncoder" ref="passwordEncoder" />
       <property name="policyComponent" ref="policyComponent" />
       <property name="authenticationCache" ref="authenticationCache" />
+      <property name="singletonCache" ref="immutableSingletonCache"/>
    </bean>
 
    <!-- Authentication service for chaining -->
diff --git a/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml b/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
index c37b971488..5b7eaedf0e 100644
--- a/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
+++ b/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
@@ -193,13 +193,21 @@
                 </bean>
                 <bean id="openFileScenario" class="org.alfresco.filesys.repo.rules.ScenarioOpenFile">
                     <property name="pattern"><value>.*</value></property>
-                    <property name="timeout"><value>3000000</value></property>
+                    <!-- 20 seconds to open a file -->
+                    <property name="timeout"><value>20000</value></property>
                     <property name="ranking"><value>HIGH</value></property>
                 </bean>
                 <bean id="framemakerFileScenario" class="org.alfresco.filesys.repo.rules.ScenarioDoubleRenameShuffle">
                     <property name="pattern"><value>.*.backup.fm$</value></property>
                     <property name="timeout"><value>60000</value></property>
                     <property name="ranking"><value>HIGH</value></property>
+                </bean>   
+                <!--  Mac word 2011 with backup -->
+                <bean id="word2011WithBackup" class="org.alfresco.filesys.repo.rules.ScenarioDoubleRenameShuffle">
+                    <property name="pattern"><value>^Backup.*.doc[x]</value></property>
+                    <property name="timeout"><value>20000</value></property>
+                    <property name="ranking"><value>MEDIUM</value></property>
+                    <property name="deleteBackup"><value>true</value></property>
                 </bean>                
             </list>
         </property>
diff --git a/config/alfresco/swf-transform-context.xml b/config/alfresco/swf-transform-context.xml
index 3e0e3fc2fa..30ea5141bd 100644
--- a/config/alfresco/swf-transform-context.xml
+++ b/config/alfresco/swf-transform-context.xml
@@ -40,9 +40,47 @@
             <value>application/pdf</value>
          </list>
       </property>
-      <!-- Note: there are maxSourceSizeKBytes limits on transformer.OpenOffice for txt->pdf and xlsx->pdf
-           which may cause this transformer not to be selected because it is too slow. -->
+      <property name="mimetypeLimits">
+         <ref bean="transformer.complex.OpenOffice.Pdf2swf.mimetypeLimits"/>
+      </property>
    </bean>
+ 
+   <!-- Note: there are maxSourceSizeKBytes limits on transformer.OpenOffice transforming to pdf
+        which may cause this transformer not to be selected because it is too slow. -->
+   <!-- The following further restricts this as some types convert to PDF quickly but are large
+        so convert to swf slowly.  -->
+   <bean id="transformer.complex.OpenOffice.Pdf2swf.mimetypeLimits" class="org.alfresco.service.cmr.repository.TransformationOptionLimitsMap">
+      <constructor-arg>
+         <value>
+            doc  swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.doc.swf.maxSourceSizeKBytes}  ;
+            docx swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.docx.swf.maxSourceSizeKBytes} ;
+            docm swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.docm.swf.maxSourceSizeKBytes} ;
+            dotx swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.dotx.swf.maxSourceSizeKBytes} ;
+            dotm swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.dotm.swf.maxSourceSizeKBytes} ;
+            ppt  swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.ppt.swf.maxSourceSizeKBytes}  ;
+            pptx swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.pptx.swf.maxSourceSizeKBytes} ;
+            pptm swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.pptm.swf.maxSourceSizeKBytes} ;
+            ppsx swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.ppsx.swf.maxSourceSizeKBytes} ;
+            ppsm swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.ppsm.swf.maxSourceSizeKBytes} ;
+            potx swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.potx.swf.maxSourceSizeKBytes} ;
+            potm swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.potm.swf.maxSourceSizeKBytes} ;
+            ppam swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.ppam.swf.maxSourceSizeKBytes} ;
+            sldx swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.sldx.swf.maxSourceSizeKBytes} ;
+            sldm swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.sldm.swf.maxSourceSizeKBytes} ;
+            xls  swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xls.swf.maxSourceSizeKBytes}  ;
+            xlsx swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xlsx.swf.maxSourceSizeKBytes} ;
+            xltx swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xltx.swf.maxSourceSizeKBytes} ;
+            xlsm swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xlsm.swf.maxSourceSizeKBytes} ;
+            xltm swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xltm.swf.maxSourceSizeKBytes} ;
+            xlam swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xlam.swf.maxSourceSizeKBytes} ;
+            xlsb swf  maxSourceSizeKBytes ${content.transformer.OpenOffice.Pdf2swf.mimeTypeLimits.xlsb.swf.maxSourceSizeKBytes}
+         </value>
+      </constructor-arg>
+      <constructor-arg>
+         <ref bean="mimetypeService" />
+      </constructor-arg>
+   </bean>
+ 
    
    <bean id="transformer.complex.iWorks.Pdf2swf"
         class="org.alfresco.repo.content.transform.ComplexContentTransformer"
@@ -74,7 +112,7 @@
             <value>application/pdf</value>
          </list>
       </property>
-      <!-- Note: there are maxSourceSizeKBytes limit on transformer.PdfBox.TextToPdf for txt->pdf
+      <!-- Note: there are maxSourceSizeKBytes limits on transformer.PdfBox.TextToPdf for txt->pdf
            which may cause this transformer not to be selected because it is too slow and another
            maxSourceSizeKBytes limit on transformer.Pdf2swf, but what is the point of doing the
            first one only to give up on the second when we can guess the pdf size is just a bit 
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_docm.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_docm.png
new file mode 100644
index 0000000000..4054130eec
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_docm.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_dotm.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_dotm.png
new file mode 100644
index 0000000000..4054130eec
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_dotm.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_dotx.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_dotx.png
new file mode 100644
index 0000000000..4054130eec
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_dotx.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_potm.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_potm.png
new file mode 100644
index 0000000000..7759087f34
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_potm.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_potx.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_potx.png
new file mode 100644
index 0000000000..7759087f34
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_potx.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_ppam.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_ppam.png
new file mode 100644
index 0000000000..7759087f34
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_ppam.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsm.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsm.png
new file mode 100644
index 0000000000..7759087f34
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsm.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsx.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsx.png
new file mode 100644
index 0000000000..7759087f34
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsx.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_pptm.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_pptm.png
new file mode 100644
index 0000000000..7759087f34
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_pptm.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_sldm.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_sldm.png
new file mode 100644
index 0000000000..7759087f34
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_sldm.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_sldx.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_sldx.png
new file mode 100644
index 0000000000..7759087f34
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_sldx.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xlam.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xlam.png
new file mode 100644
index 0000000000..3100b10e90
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xlam.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsb.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsb.png
new file mode 100644
index 0000000000..3100b10e90
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsb.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsm.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsm.png
new file mode 100644
index 0000000000..3100b10e90
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsm.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xltm.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xltm.png
new file mode 100644
index 0000000000..3100b10e90
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xltm.png differ
diff --git a/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xltx.png b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xltx.png
new file mode 100644
index 0000000000..3100b10e90
Binary files /dev/null and b/config/alfresco/thumbnail/thumbnail_placeholder_doclib_xltx.png differ
diff --git a/config/alfresco/transfer-service-context.xml b/config/alfresco/transfer-service-context.xml
index e7a015f86a..fa5a9d4163 100644
--- a/config/alfresco/transfer-service-context.xml
+++ b/config/alfresco/transfer-service-context.xml
@@ -22,9 +22,9 @@
 		<property name="transactionService">
 			<ref bean="TransactionService" />
 		</property>
-		<property name="tenantService">
-			<ref bean="tenantService" />
-		</property>
+        <property name="singletonCache">
+            <ref bean="immutableSingletonCache" />
+        </property>
 		<property name="descriptorService">
             <ref bean="DescriptorService" />
         </property>
@@ -87,6 +87,7 @@
 		<property name="transactionService" ref="TransactionService" />
 		<property name="actionService" ref="ActionService" />
 		<property name="tenantService" ref="tenantService" />
+		<property name="singletonCache" ref="immutableSingletonCache" />
 		<property name="ruleService" ref="RuleService" />
 		<property name="descriptorService" ref="DescriptorService" />
 		<property name="alienProcessor" ref="alienProcessor" />
@@ -275,6 +276,14 @@
         <property name="transferService" ref="TransferService"/>
         <property name="serviceRegistry">
          <ref bean="ServiceRegistry" />
+        </property>
+        <property name="excludedAspects">
+         <list>
+            <value>{http://www.alfresco.org/model/rule/1.0}rules</value>
+            <value>{http://www.alfresco.org/model/content/1.0}versionable</value>
+            <value>{http://www.alfresco.org/model/content/1.0}mlDocument</value>
+            <value>{http://www.alfresco.org/model/forum/1.0}discussable</value> 
+         </list>
       </property>
    </bean>
 
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index c5de80c862..66418557e1 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=6006
+version.schema=6007
diff --git a/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java b/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java
index ffa76add95..19cbf4a562 100644
--- a/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java
+++ b/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.alfresco.cmis.CMISDataTypeEnum;
 import org.alfresco.cmis.CMISDictionaryService;
@@ -36,15 +35,15 @@ import org.alfresco.cmis.CMISTypeDefinition;
 import org.alfresco.cmis.CMISTypeId;
 import org.alfresco.cmis.mapping.CMISMapping;
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.dictionary.DictionaryDAO;
 import org.alfresco.repo.dictionary.DictionaryListener;
-import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.namespace.QName;
-import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationEvent;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 
 
 /**
@@ -61,7 +60,6 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
     private DictionaryDAO dictionaryDAO;
     protected CMISMapping cmisMapping;
     protected DictionaryService dictionaryService;
-    protected TenantService tenantService;
 
     /**
      * Set the mapping service
@@ -93,20 +91,15 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
         this.dictionaryDAO = dictionaryDAO;
     }
     
-    /**
-     * Set the tenant Service
-     * 
-     * @param tenantService
-     */
-    public void setTenantService(TenantService tenantService)
+    public void setSingletonCache(SimpleCache<String, DictionaryRegistry> singletonCache)
     {
-        this.tenantService = tenantService;
+        this.singletonCache = singletonCache;
     }
-
-
-    /** CMIS Dictionary Registry (tenant-aware) */
-    private Map<String, DictionaryRegistry> registryMap = new ConcurrentHashMap<String, DictionaryRegistry>(4);
-
+    
+    // note: cache is tenant-aware (if using EhCacheAdapter shared cache)
+    
+    private SimpleCache<String, DictionaryRegistry> singletonCache; // eg. for cmisDictionaryRegistry
+    private final String KEY_CMIS_DICTIONARY_REGISTRY = "key.cmisDictionaryRegistry";
     
     /**
      * CMIS Dictionary registry
@@ -217,12 +210,11 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
     
     private DictionaryRegistry getRegistry()
     {
-        String tenantDomain = tenantService.getCurrentUserDomain();
-        DictionaryRegistry registry = registryMap.get(tenantDomain);
+        DictionaryRegistry registry = singletonCache.get(KEY_CMIS_DICTIONARY_REGISTRY);
         if (registry == null)
         {
             init();
-            registry = registryMap.get(tenantDomain);
+            registry = singletonCache.get(KEY_CMIS_DICTIONARY_REGISTRY);
         }
         return registry;
     }
@@ -472,7 +464,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
         }
         
         // publish new registry
-        registryMap.put(tenantService.getCurrentUserDomain(), registry);
+        singletonCache.put(KEY_CMIS_DICTIONARY_REGISTRY, registry);
         
         if (logger.isInfoEnabled())
             logger.info("Initialized CMIS Dictionary. Types:" + registry.typeDefsByTypeId.size() + ", Base Types:" + registry.baseTypes.size() + ", Properties:" + registry.propDefsByPropId.size());
@@ -501,7 +493,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
      */
     public void afterDictionaryDestroy()
     {
-        registryMap.remove(tenantService.getCurrentUserDomain());
+        singletonCache.remove(KEY_CMIS_DICTIONARY_REGISTRY);
     }
     
     /*
diff --git a/source/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java b/source/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java
index b036204325..7ea8778253 100644
--- a/source/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java
+++ b/source/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java
@@ -28,6 +28,7 @@ import org.alfresco.filesys.alfresco.ExtendedDiskInterface;
 import org.alfresco.jlan.server.SrvSession;
 import org.alfresco.jlan.server.core.DeviceContext;
 import org.alfresco.jlan.server.core.DeviceContextException;
+import org.alfresco.jlan.server.core.SharedDevice;
 import org.alfresco.jlan.server.filesys.DiskDeviceContext;
 import org.alfresco.jlan.server.filesys.DiskInterface;
 import org.alfresco.jlan.server.filesys.DiskSizeInterface;
@@ -134,14 +135,29 @@ public class BufferedContentDiskDriver implements ExtendedDiskInterface,
          */
         private static final long serialVersionUID = 1L;
         
+        String deviceName;
         String path;
         String user;
         int hashCode;
         
-        public FileInfoKey(String user, String path)
+        public FileInfoKey(SrvSession sess, String path, TreeConnection tree)
         {
             this.path = path;
-            this.user = user;
+            this.user = sess.getUniqueId();
+            this.deviceName = tree.getSharedDevice().getName();
+            
+//            if(deviceName == null)
+//            {
+//                throw new RuntimeException("device name is null");
+//            }
+//            if(path == null)
+//            {
+//                throw new RuntimeException("path is null");
+//            }
+//            if(user == null)
+//            {
+//                throw new RuntimeException("unique id is null");
+//            }
         }
         
         @Override
@@ -158,7 +174,7 @@ public class BufferedContentDiskDriver implements ExtendedDiskInterface,
               
            FileInfoKey o = (FileInfoKey)other;
            
-           return path.equals(o.path) && user.equals(o.user);
+           return path.equals(o.path) && user.equals(o.user) && deviceName.equals(o.deviceName);
         }     
           
         @Override
@@ -166,7 +182,7 @@ public class BufferedContentDiskDriver implements ExtendedDiskInterface,
         {
             if(hashCode == 0)
             {
-                hashCode = (user+path).hashCode();
+                hashCode = (user+path+deviceName).hashCode();
             }
             return hashCode;
         }
@@ -176,11 +192,13 @@ public class BufferedContentDiskDriver implements ExtendedDiskInterface,
             String path) throws IOException
     {
                
-        String userName = AuthenticationUtil.getFullyAuthenticatedUser();
+        //String userName = AuthenticationUtil.getFullyAuthenticatedUser();
+        SharedDevice device = tree.getSharedDevice();
+        String deviceName = device.getName();
        
         if(logger.isDebugEnabled())
         {
-            logger.debug("getFileInformation userName:" + userName + ", path:" + path);
+            logger.debug("getFileInformation session:" + sess.getUniqueId() + ", deviceName:" + deviceName + ", path:" + path);
         }
         
         if(path == null)
@@ -188,7 +206,7 @@ public class BufferedContentDiskDriver implements ExtendedDiskInterface,
             throw new IllegalArgumentException("Path is null");
         }
         
-        FileInfoKey key = new FileInfoKey(userName, path);
+        FileInfoKey key = new FileInfoKey(sess, path, tree);
         
         FileInfo fromCache = fileInfoCache.get(key);
         
@@ -311,7 +329,7 @@ public class BufferedContentDiskDriver implements ExtendedDiskInterface,
                             ", fileId:" +finfo.getFileId() +
                             ", fileSize:" +finfo.getSize() +
                             ", directoryId:" + finfo.getDirectoryId() + 
-                            ", createdDate: " + finfo.getCreationDateTime() + 
+                            ", createdDate: " + new Date(finfo.getCreationDateTime()) + 
                             ", accessDate:" + new Date(finfo.getAccessDateTime()) +
                             ", modifiedDate:" + new Date(finfo.getModifyDateTime()) +
                             ", changeDate:" + new Date(finfo.getChangeDateTime()) +
@@ -335,15 +353,14 @@ public class BufferedContentDiskDriver implements ExtendedDiskInterface,
     @Override
     public int fileExists(SrvSession sess, TreeConnection tree, String path)
     {
-       
-        String userName = AuthenticationUtil.getFullyAuthenticatedUser();
+        String deviceName = tree.getSharedDevice().getName();
         
         if(logger.isDebugEnabled())
         {
-            logger.debug("fileExists userName:" + userName + ", path:" + path);
+            logger.debug("fileExists session:" + sess.getUniqueId() + ", deviceName" + deviceName + ", path:" + path);
         }
         
-        FileInfoKey key = new FileInfoKey(userName, path);
+        FileInfoKey key = new FileInfoKey(sess, path, tree);
         
         FileInfo fromCache = fileInfoCache.get(key);
         
diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
index cb3eb2a2e8..03400ef54b 100644
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
@@ -3183,8 +3183,9 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
 
                                 //Change state for tmp node to allow delete it without special permission
                                 String newStateNodeName = (String) nodeService.getProperty(newStateNode, ContentModel.PROP_NAME);
-                                FileState stateForTmp = ctx.getStateCache().findFileState(newName.substring(0,newName.lastIndexOf("\\")) +"\\"+ newStateNodeName);
+                                FileState stateForTmp = ctx.getStateCache().findFileState(newName.substring(0,newName.lastIndexOf("\\")) +"\\"+ newStateNodeName, true);
                                 stateForTmp.addAttribute(CanDeleteWithoutPerms, true);
+                                stateForTmp.setFileStatus(FileStatus.FileExists); 
                                 stateForTmp.setExpiryTime(System.currentTimeMillis() + FileState.DeleteTimeout);
                                 if ( logger.isDebugEnabled() && ctx.hasDebug(AlfrescoContext.DBG_RENAME))
                                     logger.debug("  Set CanDeleteWithoutPerms=true for " + stateForTmp);
@@ -3268,8 +3269,9 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
                                 cloneNode( name, nodeToMoveRef, targetNodeRef, ctx);
                                 
                                 //Change state for tmp node to allow delete it without special permission
-                                FileState stateForTmp = ctx.getStateCache().findFileState(newName);
+                                FileState stateForTmp = ctx.getStateCache().findFileState(newName, true);
                                 stateForTmp.addAttribute(CanDeleteWithoutPerms, true);
+                                stateForTmp.setFileStatus(FileStatus.FileExists); 
                                 stateForTmp.setExpiryTime(System.currentTimeMillis() + FileState.DeleteTimeout);
                                 if ( logger.isDebugEnabled() && ctx.hasDebug(AlfrescoContext.DBG_RENAME))
                                     logger.debug("  Set CanDeleteWithoutPerms=true for " + stateForTmp);
diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
index 0af000e8aa..8956e70e60 100644
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
@@ -148,6 +148,7 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
     private NodeMonitorFactory m_nodeMonitorFactory;
     private ContentComparator contentComparator;
 
+    // TODO Should not be here - should be specific to a context.
 	private boolean isLockedFilesAsOffline;
 	
     /**
@@ -1345,11 +1346,25 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
                 if (sameFolder == true)
                 {
                     fileFolderService.rename(nodeToMoveRef, name);
+                    if (logger.isDebugEnabled())
+                    {
+                        logger.debug("  Renamed " + (isFolder ? "folder" : "file") + ":" +
+                                "   Old name:      " + oldName + "\n" +
+                                "   New name:      " + newName + "\n" );
+                    }
                     
                 }
                 else
                 {
                     fileFolderService.moveFrom(nodeToMoveRef,  sourceFolderRef, targetFolderRef, name);
+                    logger.debug(
+                            "Moved between different folders: \n" +
+                            "   Old name:      " + oldName + "\n" +
+                            "   New name:      " + newName + "\n" +
+                            "   Source folder: " + sourceFolderRef + "\n" +
+                            "   Target folder: " + targetFolderRef + "\n" +
+                            "   Node:          " + nodeToMoveRef + "\n" +
+                            "   Aspects:       " + nodeService.getAspects(nodeToMoveRef));
                 }
                 
                 if (logger.isDebugEnabled())
@@ -1629,7 +1644,26 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
                 }
                 
             }
-
+            
+            // Change Date is last write ?
+            if ( info.hasSetFlag(FileInfo.SetChangeDate) && info.hasChangeDateTime()) 
+            {                
+                Date changeDate = new Date( info.getChangeDateTime());
+                if ( logger.isDebugEnabled())
+                {
+                    logger.debug("Set change date (Not implemented)" + name + ", " + changeDate);
+                }
+                
+            }
+            if ( info.hasSetFlag(FileInfo.SetAccessDate) && info.hasAccessDateTime()) 
+            {
+                Date accessDate = new Date( info.getAccessDateTime());
+                if ( logger.isDebugEnabled())
+                {
+                    logger.debug("Set access date (Not implemented)" + name + ", " + accessDate);
+                }
+            }
+            
             // Did we have any cm:auditable properties?
             if (auditableProps.size() > 0)
             {
@@ -2298,6 +2332,7 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
                              
             NodeRef nodeRef = cifsHelper.createNode(dirNodeRef, folderName, ContentModel.TYPE_CONTENT);
 
+            
             nodeService.addAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT, null);
                                     
             File file = TempFileProvider.createTempFile("cifs", ".bin");
@@ -2305,6 +2340,18 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
             TempNetworkFile netFile = new TempNetworkFile(file, path);
             netFile.setChanged(true);
             
+            Serializable created = nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED); 
+            if(created != null && created instanceof Date)
+            {
+                Date d = (Date)created;
+                if(logger.isDebugEnabled())
+                {
+                    logger.debug("replacing create date to date:" + d);
+                }
+                netFile.setCreationDate(d.getTime());
+                netFile.setModifyDate(d.getTime());
+            }
+            
             // Always allow write access to a newly created file
             netFile.setGrantedAccess(NetworkFile.READWRITE);
             netFile.setAllowedAccess(NetworkFile.READWRITE);
@@ -2499,6 +2546,8 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
                             }
 
                             netFile = new TempNetworkFile(file, name);
+                            netFile.setCreationDate(fileInfo.getCreationDateTime());
+                            netFile.setModifyDate(fileInfo.getModifyDateTime());
                             
                             netFile.setGrantedAccess( NetworkFile.READWRITE);
                              
diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
index 5be2550bf2..2dfe774517 100644
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
@@ -4936,6 +4936,7 @@ public class ContentDiskDriverTest extends TestCase
         
         try
         {
+            logger.debug("expect to get exception - cleaning garbage");
             tran.doInTransaction(deleteGarbageFileCB);
         }
         catch (Exception e)
@@ -5079,7 +5080,181 @@ public class ContentDiskDriverTest extends TestCase
         
     } // testScenarioMSPowerpoint2011MacSaveShuffle
 
-    
+    /**
+     * This test tries to simulate the cifs shuffling that is done to
+     * support MS Word 2011 on Mac with backup turned on. 
+     * 
+     * a) TEST.DOCX
+     * b) Create new temp file in temp dir Word Work File D_.tmp
+     * c) Delete backup file.
+     * c) Rename TEST.DOCX to Backup of TEST.docx
+     * d) Move temp file to target dir
+     * d) Rename Word Work File D_.tmp to TEST.docx
+     */
+    public void testScenarioMSWord20011MacSaveWithBackup() throws Exception
+    {
+        logger.debug("testScenarioMSWord20011MacSaveWithBackup");
+        final String FILE_NAME = "TEST.DOCX";
+        final String FILE_BACKUP = "Backup of TEST.docx";
+        final String FILE_NEW_TEMP = "Word Work File D_.tmp";
+        
+        class TestContext
+        {
+            NetworkFile firstFileHandle;
+            NetworkFile newFileHandle;            
+            NodeRef testNodeRef;   // node ref of test.doc
+        };
+        
+        final TestContext testContext = new TestContext();
+        
+        final String TEST_ROOT_DIR = "\\ContentDiskDriverTest";
+        final String TEST_DIR = "\\ContentDiskDriverTest\\testScenarioMSWord20011MacSaveWithBackup";
+        final String TEST_TEMP_DIR = "\\ContentDiskDriverTest\\testScenarioMSWord20011MacSaveWithBackup\\.Temporary Items";
+        
+        ServerConfiguration scfg = new ServerConfiguration("testServer");
+        TestServer testServer = new TestServer("testServer", scfg);
+        final SrvSession testSession = new TestSrvSession(666, testServer, "cifs", "remoteName");
+        DiskSharedDevice share = getDiskSharedDevice();
+        final TreeConnection testConnection = testServer.getTreeConnection(share);
+        final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper();
+        
+        logger.debug("Step 0 - initialise");
+        
+        /**
+         * Create a file in the test directory
+         */           
+        RetryingTransactionCallback<Void> createFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                /**
+                 * Create the test directory we are going to use 
+                 */
+                FileOpenParams createRootDirParams = new FileOpenParams(TEST_ROOT_DIR, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                FileOpenParams createDirParams = new FileOpenParams(TEST_DIR, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                FileOpenParams createTempDirParams = new FileOpenParams(TEST_TEMP_DIR, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                driver.createDirectory(testSession, testConnection, createRootDirParams);
+                driver.createDirectory(testSession, testConnection, createDirParams);
+                driver.createDirectory(testSession, testConnection, createTempDirParams);
+                
+                /**
+                 * Create the file we are going to use
+                 */
+                FileOpenParams createFileParams = new FileOpenParams(TEST_DIR + "\\" + FILE_NAME, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                testContext.firstFileHandle = driver.createFile(testSession, testConnection, createFileParams);
+                assertNotNull(testContext.firstFileHandle);
+                
+                // no need to test lots of different properties, that's already been tested above
+                testContext.testNodeRef = getNodeForPath(testConnection, TEST_DIR + "\\" + FILE_NAME);
+                nodeService.setProperty(testContext.testNodeRef, TransferModel.PROP_ENABLED, true);
+                nodeService.addAspect(testContext.testNodeRef, ContentModel.ASPECT_VERSIONABLE, null);
+                
+                String testContent = "MS Word 2011 shuffle test";
+                byte[] testContentBytes = testContent.getBytes();
+                testContext.firstFileHandle.writeFile(testContentBytes, testContentBytes.length, 0, 0);
+                testContext.firstFileHandle.close();  
+                        
+                return null;
+            }
+        };
+        tran.doInTransaction(createFileCB, false, true);
+               
+        /**
+         * a) Save the temp file in the temp dir
+         */
+        logger.debug("Step a - create a temp file in the temp dir");
+        RetryingTransactionCallback<Void> saveNewFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                FileOpenParams createFileParams = new FileOpenParams(TEST_TEMP_DIR + "\\" + FILE_NEW_TEMP, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                testContext.newFileHandle = driver.createFile(testSession, testConnection, createFileParams);
+                assertNotNull(testContext.newFileHandle);
+                String testContent = "MS Word 2011 shuffle test This is new content";
+                byte[] testContentBytes = testContent.getBytes();
+                testContext.newFileHandle.writeFile(testContentBytes, testContentBytes.length, 0, 0);
+                testContext.newFileHandle.close();
+              
+                return null;
+            }
+        };
+        tran.doInTransaction(saveNewFileCB, false, true);
+        
+        /*
+         * Step b not used in test case
+         */
+        
+        /**
+         * c) rename the target file to a backup file
+         */
+        logger.debug("Step c - rename the target file");
+        RetryingTransactionCallback<Void> renameOldFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.renameFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME, TEST_DIR + "\\" + FILE_BACKUP);
+                return null;
+            }
+        };
+        tran.doInTransaction(renameOldFileCB, false, true);
+        
+        
+        /**
+         * d) Move the new file into target dir
+         */
+        logger.debug("Step d - move new file into target dir");
+        RetryingTransactionCallback<Void> moveNewFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.renameFile(testSession, testConnection, TEST_TEMP_DIR + "\\" + FILE_NEW_TEMP, TEST_DIR + "\\" + FILE_NEW_TEMP); 
+                return null;
+            }
+        };
+        
+        tran.doInTransaction(moveNewFileCB, false, true);
+        
+        /**
+         * e) Rename temp file into place.
+         */
+        logger.debug("Step e - rename temp file into place");
+        RetryingTransactionCallback<Void> renameTempFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.renameFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NEW_TEMP, TEST_DIR + "\\" + FILE_NAME);
+                return null;
+            }
+        };
+        tran.doInTransaction(renameTempFileCB, false, true);
+        
+        
+        /**
+         * Validate
+         */
+        
+        RetryingTransactionCallback<Void> validateCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+               NodeRef shuffledNodeRef = getNodeForPath(testConnection, TEST_DIR + "\\" + FILE_NAME);
+               
+               Map<QName, Serializable> props = nodeService.getProperties(shuffledNodeRef);
+               assertTrue("node does not contain shuffled ENABLED property", props.containsKey(TransferModel.PROP_ENABLED));
+               assertEquals("name wrong", FILE_NAME, nodeService.getProperty(shuffledNodeRef, ContentModel.PROP_NAME) );    
+               return null;
+            }
+        };
+        
+        tran.doInTransaction(validateCB, false, true);
+
+    } // testScenarioMSMacWord20011SaveWithBackup save
     
     /**
      * Test server
@@ -5125,6 +5300,7 @@ public class ContentDiskDriverTest extends TestCase
             // Set the client info to user "fred"
             ClientInfo cinfo = ClientInfo.createInfo("fred", null);
             setClientInformation(cinfo);
+            setUniqueId("test:" + sessId);
 
         }
 
diff --git a/source/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java b/source/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java
index 98ef3f7dd7..4a66ac4f76 100644
--- a/source/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java
+++ b/source/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java
@@ -227,7 +227,7 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
         else
         {
             // Error - contact broken
-            logger.error("contract broken - NetworkFile not returned");
+            logger.error("contract broken - NetworkFile not returned. " + ret == null ? "Return value is null" : ret);
             return null;
         }
     }
@@ -376,7 +376,7 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
         else
         {
             // Error - contact broken
-            logger.error("contract broken - NetworkFile not returned");
+            logger.error("contract broken - NetworkFile not returned. " + ret == null ? "Return value is null" : ret);
             return null;
         }
 
diff --git a/source/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffleInstance.java b/source/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffleInstance.java
index 1428a2ec96..7f2553b7c5 100644
--- a/source/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffleInstance.java
+++ b/source/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffleInstance.java
@@ -225,10 +225,11 @@ public class ScenarioCreateShuffleInstance implements ScenarioInstance
             break;
             
         case DELETE:
-            
+           
             /**
              * Looking for a delete of the destination
              */
+            
             if(operation instanceof DeleteFileOperation)
             {
                 DeleteFileOperation d = (DeleteFileOperation)operation;
@@ -242,6 +243,14 @@ public class ScenarioCreateShuffleInstance implements ScenarioInstance
                 }
             }
             
+            /**
+             * Todo consider create shuffle with backup file which will never 
+             * calls delete - do we need to pattern match on "Backup*".  
+             * At the moment the delete state does nothing - hence 
+             * we can simply set complete here for all situations.
+             */
+            isComplete = true;
+            
             break;
         }
         
diff --git a/source/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffle.java b/source/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffle.java
index b921665ce2..b9e9f1444c 100644
--- a/source/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffle.java
+++ b/source/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffle.java
@@ -33,6 +33,8 @@ import org.apache.commons.logging.LogFactory;
  * 
  * a) Existing file renamed out of the way.  X.fm to X.backup.fm
  * b) New file moved renamed into place. X.fm.C29
+ * 
+ * Scenario is triggered by the first rename matching a pattern.
  */
 public class ScenarioDoubleRenameShuffle implements Scenario
 {
@@ -44,6 +46,7 @@ public class ScenarioDoubleRenameShuffle implements Scenario
      */
     private Pattern pattern;
     private String strPattern;
+    private boolean deleteBackup;
     
     
     private long timeout = 30000;
@@ -71,6 +74,7 @@ public class ScenarioDoubleRenameShuffle implements Scenario
                 ScenarioDoubleRenameShuffleInstance instance = new ScenarioDoubleRenameShuffleInstance();
                 instance.setTimeout(timeout);
                 instance.setRanking(ranking);
+                instance.setDeleteBackup(deleteBackup);
                 return instance;
             }
         }
@@ -110,4 +114,14 @@ public class ScenarioDoubleRenameShuffle implements Scenario
     {
         return ranking;
     }
+
+    public void setDeleteBackup(boolean deleteBackup)
+    {
+        this.deleteBackup = deleteBackup;
+    }
+
+    public boolean isDeleteBackup()
+    {
+        return deleteBackup;
+    }
 }
diff --git a/source/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffleInstance.java b/source/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffleInstance.java
index 31fe2f3213..833b153cf7 100644
--- a/source/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffleInstance.java
+++ b/source/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffleInstance.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import org.alfresco.filesys.repo.OpenFileMode;
 import org.alfresco.filesys.repo.rules.commands.CompoundCommand;
 import org.alfresco.filesys.repo.rules.commands.CopyContentCommand;
+import org.alfresco.filesys.repo.rules.commands.DeleteFileCommand;
 import org.alfresco.filesys.repo.rules.commands.RenameFileCommand;
 import org.alfresco.filesys.repo.rules.operations.CreateFileOperation;
 import org.alfresco.filesys.repo.rules.operations.DeleteFileOperation;
@@ -44,7 +45,9 @@ import org.apache.commons.logging.LogFactory;
  * <p>
  * If this filter is active then this is what happens.
  * a) Existing file moved out of the way (Y to Z).   Raname tracked.
- * b) New file moved into place (X to Y).   Scenario kicks in to change commands.
+ * b) New file moved into place (X to Y).   
+ * 
+ * Scenario kicks in to change commands.
  */
 public class ScenarioDoubleRenameShuffleInstance implements ScenarioInstance
 {
@@ -66,6 +69,7 @@ public class ScenarioDoubleRenameShuffleInstance implements ScenarioInstance
     private String fileEnd;
     
     private Ranking ranking;
+    private boolean deleteBackup;
     
     /**
      * Timeout in ms.  Default 30 seconds.
@@ -132,7 +136,7 @@ public class ScenarioDoubleRenameShuffleInstance implements ScenarioInstance
         case RENAME1:
             
             /**
-             * Looking for the seconf of two renames X(createName) to Y(middle) to Z(end)
+             * Looking for the second of two renames X(createName) to Y(middle) to Z(end)
              */              
             if(operation instanceof RenameFileOperation)
             {
@@ -169,13 +173,27 @@ public class ScenarioDoubleRenameShuffleInstance implements ScenarioInstance
                     String oldFolder = paths[0];
            
                     ArrayList<Command> commands = new ArrayList<Command>();
+                    
                     RenameFileCommand r1 = new RenameFileCommand(fileEnd, fileMiddle, r.getRootNodeRef(), oldFolder + "\\" + fileEnd, oldFolder + "\\" + fileMiddle);
-                    CopyContentCommand copyContent = new CopyContentCommand(fileFrom, fileMiddle, r.getRootNodeRef(), oldFolder + "\\" + fileFrom, oldFolder + "\\" + fileMiddle);
-                    RenameFileCommand r2 = new RenameFileCommand(fileFrom, fileEnd, r.getRootNodeRef(), oldFolder + "\\" + fileFrom, oldFolder + "\\" + fileEnd); 
-                        
                     commands.add(r1);
+                    CopyContentCommand copyContent = new CopyContentCommand(fileFrom, fileMiddle, r.getRootNodeRef(), oldFolder + "\\" + fileFrom, oldFolder + "\\" + fileMiddle);
                     commands.add(copyContent);
-                    commands.add(r2);
+                    if(deleteBackup)
+                    {
+                        logger.debug("deleteBackup option turned on");
+                        DeleteFileCommand d1 = new DeleteFileCommand(oldFolder, r.getRootNodeRef(), oldFolder + "\\" + fileFrom);
+                        commands.add(d1);
+                    }
+                    else
+                    {
+                        RenameFileCommand r2 = new RenameFileCommand(fileFrom, fileEnd, r.getRootNodeRef(), oldFolder + "\\" + fileFrom, oldFolder + "\\" + fileEnd);                     
+                        commands.add(r2);
+                    }   
+                    
+                    /**
+                     * TODO - we may need to copy a new node for the backup and delete the temp node.
+                     * It depends if we care about the contents of the Backup file.
+                     */
                     
                     isComplete = true;
                     return new CompoundCommand(commands);                                        
@@ -219,4 +237,14 @@ public class ScenarioDoubleRenameShuffleInstance implements ScenarioInstance
     {
         return timeout;
     }
+
+    public void setDeleteBackup(boolean deleteBackup)
+    {
+        this.deleteBackup = deleteBackup;
+    }
+
+    public boolean isDeleteBackup()
+    {
+        return deleteBackup;
+    }
 }
diff --git a/source/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java b/source/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java
index d80aa1e693..c0f28327fa 100644
--- a/source/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java
+++ b/source/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java
@@ -84,7 +84,9 @@ class ScenarioOpenFileInstance implements ScenarioInstance
     enum InternalState
     {
         NONE,
-        OPEN
+        OPENING,
+        OPEN,
+        ERROR
     } ;
     
     InternalState state = InternalState.NONE;
@@ -158,11 +160,15 @@ class ScenarioOpenFileInstance implements ScenarioInstance
                     
                     if(name != null)
                     {
+                        state = InternalState.OPENING;
+                        logger.debug("Create File name:" + name);
                         ArrayList<Command> commands = new ArrayList<Command>();
                         ArrayList<Command> postCommitCommands = new ArrayList<Command>();
+                        ArrayList<Command> postErrorCommands = new ArrayList<Command>();
                         commands.add(new CreateFileCommand(c.getName(), c.getRootNodeRef(), c.getPath(), c.getAllocationSize()));
                         postCommitCommands.add(newOpenFileCallbackCommand());
-                        return new CompoundCommand(commands, postCommitCommands);
+                        postErrorCommands.add(newOpenFileErrorCallbackCommand());
+                        return new CompoundCommand(commands, postCommitCommands, postErrorCommands);
                     }
                 }
                 else if(operation instanceof OpenFileOperation)
@@ -171,18 +177,68 @@ class ScenarioOpenFileInstance implements ScenarioInstance
                     name = o.getName();
                     if(name != null)
                     {
+                        state = InternalState.OPENING;
+                        logger.debug("Open File name:" + name);
                         ArrayList<Command> commands = new ArrayList<Command>();
                         commands.add(new OpenFileCommand(o.getName(), o.getMode(), o.isTruncate(), o.getRootNodeRef(), o.getPath()));
                         ArrayList<Command> postCommitCommands = new ArrayList<Command>();
+                        ArrayList<Command> postErrorCommands = new ArrayList<Command>();
                         postCommitCommands.add(newOpenFileCallbackCommand());
-                        return new CompoundCommand(commands, postCommitCommands);
+                        postErrorCommands.add(newOpenFileErrorCallbackCommand());
+                        return new CompoundCommand(commands, postCommitCommands, postErrorCommands);
                     }
                 }
                 
                 // Scenario Not Started
+                logger.debug("Scenario not started - no name");
                 isComplete = true;
                 return null;
                 
+            case OPENING:
+                
+                if(operation instanceof OpenFileOperation)
+                {
+                    OpenFileOperation o = (OpenFileOperation)operation;
+                    
+                    if(o.getName() == null)
+                    {
+                        return null;
+                    }
+                    
+                    if(name.equalsIgnoreCase(o.getName()))
+                    {
+                        /**
+                         * TODO What to do here - one thread is in the middle of 
+                         * opening a file while another tries to open the same file 
+                         * sleep for a bit? then check state again?  What happens if file 
+                         * closes while sleeping.   For now log an error.
+                         */
+                        logger.error("Second open while in opening state. :" + name);
+//                        isComplete = true;
+//                        return null;  
+                    }
+                }
+                
+                /**
+                 * Anti-pattern : timeout - is this needed ?
+                 */
+                Date now = new Date();
+                if(now.getTime() > startTime.getTime() + getTimeout())
+                {
+                    if(logger.isDebugEnabled())
+                    {
+                        logger.debug("Instance in OPENING STATE timed out name" + name);
+                    }
+                    isComplete = true; 
+                }
+                return null;
+                
+            case ERROR:
+                
+                logger.debug("Open has failed :" + name);
+                isComplete = true;
+                return null; 
+                
             case OPEN:
                 
                 if(operation instanceof CloseFileOperation)
@@ -454,6 +510,30 @@ class ScenarioOpenFileInstance implements ScenarioInstance
         };
     }
     
+    /**
+     * Called for open file error.
+     */
+    private ResultCallback newOpenFileErrorCallbackCommand()
+    {
+        return new ResultCallback()
+        {
+            @Override
+            public void execute(Object result)
+            {
+                logger.debug("error handler - set state to error for name:" + name);
+                isComplete = true;
+                state = InternalState.ERROR;
+            }
+
+            @Override
+            public TxnReadState getTransactionRequired()
+            {
+                return TxnReadState.TXN_NONE;
+            }   
+        };
+    }
+
+    
     private boolean isReadOnly(NetworkFile file)
     {
         return (file.getGrantedAccess() == NetworkFile.READONLY);
diff --git a/source/java/org/alfresco/filesys/repo/rules/commands/DeleteFileCommand.java b/source/java/org/alfresco/filesys/repo/rules/commands/DeleteFileCommand.java
index 8d2bbadda7..b78b4e1ae8 100644
--- a/source/java/org/alfresco/filesys/repo/rules/commands/DeleteFileCommand.java
+++ b/source/java/org/alfresco/filesys/repo/rules/commands/DeleteFileCommand.java
@@ -31,6 +31,12 @@ public class DeleteFileCommand implements Command
   private NodeRef rootNode;
   private String path;
     
+  /**
+   * 
+   * @param name name of file
+   * @param rootNode root node
+   * @param path full path of file
+   */
     public DeleteFileCommand(String name, NodeRef rootNode, String path)
     {
         this.name = name;
diff --git a/source/java/org/alfresco/model/DataListModel.java b/source/java/org/alfresco/model/DataListModel.java
new file mode 100644
index 0000000000..694d96b0a2
--- /dev/null
+++ b/source/java/org/alfresco/model/DataListModel.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.model;
+
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Data List Model Constants
+ * 
+ * @author Nick Burch
+ * @since 4.0.2
+ */
+public interface DataListModel
+{
+    /** DataList Model */
+    static final String DATALIST_MODEL_1_0_URI = NamespaceService.DATALIST_MODEL_1_0_URI;
+    static final String DATALIST_MODEL_PREFIX = NamespaceService.DATALIST_MODEL_PREFIX;
+    
+    /** Data List */
+    static final QName TYPE_DATALIST = QName.createQName(DATALIST_MODEL_1_0_URI, "dataList");
+    static final QName PROP_DATALIST_ITEM_TYPE = QName.createQName(DATALIST_MODEL_1_0_URI, "dataListItemType");
+    
+    /** Parent of all Data List Items */
+    static final QName TYPE_DATALIST_ITEM = QName.createQName(DATALIST_MODEL_1_0_URI, "dataListItem");
+    
+    /** Simple ToDo List */
+    static final QName TYPE_TODO_LIST = QName.createQName(DATALIST_MODEL_1_0_URI, "todoList");
+    static final QName PROP_TODO_TITLE = QName.createQName(DATALIST_MODEL_1_0_URI, "todoTitle");
+    static final QName PROP_TODO_DUED_ATE = QName.createQName(DATALIST_MODEL_1_0_URI, "todoDueDate");
+    static final QName PROP_TODO_PRIORITY = QName.createQName(DATALIST_MODEL_1_0_URI, "todoPriority");
+    static final QName PROP_TODO_STATUS = QName.createQName(DATALIST_MODEL_1_0_URI, "todoStatus");
+    static final QName PROP_TODO_NOTES = QName.createQName(DATALIST_MODEL_1_0_URI, "todoNotes");
+    
+    /** Simple Task List */
+    static final QName TYPE_SIMPLE_TASK = QName.createQName(DATALIST_MODEL_1_0_URI, "simpletask");
+    static final QName PROP_SIMPLE_TASK_DUE_DATE = QName.createQName(DATALIST_MODEL_1_0_URI, "simpletaskDueDate");
+    static final QName PROP_SIMPLE_TASK_PRIORITY = QName.createQName(DATALIST_MODEL_1_0_URI, "simpletaskPriority");
+    static final QName PROP_SIMPLE_TASK_STATUS = QName.createQName(DATALIST_MODEL_1_0_URI, "simpletaskStatus");
+    static final QName PROP_SIMPLE_TASK_COMMENTS = QName.createQName(DATALIST_MODEL_1_0_URI, "simpletaskComments");
+    
+    /** Advanced Task List */
+    static final QName TYPE_TASK = QName.createQName(DATALIST_MODEL_1_0_URI, "task");
+    static final QName PROP_TASK_PRIORITY = QName.createQName(DATALIST_MODEL_1_0_URI, "taskPriority");
+    static final QName PROP_TASK_STATUS = QName.createQName(DATALIST_MODEL_1_0_URI, "taskStatus");
+    static final QName PROP_TASK_COMMENTS = QName.createQName(DATALIST_MODEL_1_0_URI, "taskComments");
+    
+    /** GANTT related parts of an Advanced Task */
+    static final QName ASPECT_GANTT = QName.createQName(DATALIST_MODEL_1_0_URI, "gantt");
+    static final QName PROP_GANTT_START_DATE = QName.createQName(DATALIST_MODEL_1_0_URI, "ganttStartDate");
+    static final QName PROP_GANTT_END_DATE = QName.createQName(DATALIST_MODEL_1_0_URI, "ganttEndDate");
+    static final QName PROP_GANTT_PERCENT_COMPLETE = QName.createQName(DATALIST_MODEL_1_0_URI, "ganttPercentComplete");
+    
+    /** Contact List */
+    static final QName TYPE_CONTACT = QName.createQName(DATALIST_MODEL_1_0_URI, "contact");
+    static final QName PROP_CONTACT_FIRSTNAME = QName.createQName(DATALIST_MODEL_1_0_URI, "contactFirstName");
+    static final QName PROP_CONTACT_LASTNAME = QName.createQName(DATALIST_MODEL_1_0_URI, "contactLastName");
+    static final QName PROP_CONTACT_EMAIL = QName.createQName(DATALIST_MODEL_1_0_URI, "contactEmail");
+    static final QName PROP_CONTACT_COMPANY = QName.createQName(DATALIST_MODEL_1_0_URI, "contactCompany");
+    static final QName PROP_CONTACT_JOBTITLE = QName.createQName(DATALIST_MODEL_1_0_URI, "contactJobTitle");
+    static final QName PROP_CONTACT_PHONE_OFFICE = QName.createQName(DATALIST_MODEL_1_0_URI, "contactPhoneOffice");
+    static final QName PROP_CONTACT_PHONE_MOBILE = QName.createQName(DATALIST_MODEL_1_0_URI, "contactPhoneMobile");
+    static final QName PROP_CONTACT_NOTES = QName.createQName(DATALIST_MODEL_1_0_URI, "contactNotes");
+    
+    /** Issue List */
+    static final QName TYPE_ISSUE = QName.createQName(DATALIST_MODEL_1_0_URI, "issue");
+    static final QName PROP_ISSUE_ID = QName.createQName(DATALIST_MODEL_1_0_URI, "issueID");
+    static final QName PROP_ISSUE_STATUS = QName.createQName(DATALIST_MODEL_1_0_URI, "issueStatus");
+    static final QName PROP_ISSUE_PRIORITY = QName.createQName(DATALIST_MODEL_1_0_URI, "issuePriority");
+    static final QName PROP_ISSUE_DUE_DATE = QName.createQName(DATALIST_MODEL_1_0_URI, "issueDueDate");
+    static final QName PROP_ISSUE_COMMENTS = QName.createQName(DATALIST_MODEL_1_0_URI, "issueComments");
+    
+    /** Event List */
+    static final QName TYPE_EVENT = QName.createQName(DATALIST_MODEL_1_0_URI, "event");
+    static final QName PROP_EVENT_LOCATION = QName.createQName(DATALIST_MODEL_1_0_URI, "eventLocation");
+    static final QName PROP_EVENT_NOTE = QName.createQName(DATALIST_MODEL_1_0_URI, "eventNote");
+    static final QName PROP_EVENT_START_DATE = QName.createQName(DATALIST_MODEL_1_0_URI, "eventStartDate");
+    static final QName PROP_EVENT_END_DATE = QName.createQName(DATALIST_MODEL_1_0_URI, "eventEndDate");
+    static final QName PROP_EVENT_REGISTRATIONS = QName.createQName(DATALIST_MODEL_1_0_URI, "eventRegistrations");
+    
+    /** Location List */
+    static final QName TYPE_LOCATION = QName.createQName(DATALIST_MODEL_1_0_URI, "location");
+    static final QName PROP_LOCATION_ADDRESS1 = QName.createQName(DATALIST_MODEL_1_0_URI, "locationAddress1");
+    static final QName PROP_LOCATION_ADDRESS2 = QName.createQName(DATALIST_MODEL_1_0_URI, "locationAddress2");
+    static final QName PROP_LOCATION_ADDRESS3 = QName.createQName(DATALIST_MODEL_1_0_URI, "locationAddress3");
+    static final QName PROP_LOCATION_ZIP = QName.createQName(DATALIST_MODEL_1_0_URI, "locationZip");
+    static final QName PROP_LOCATION_STATE = QName.createQName(DATALIST_MODEL_1_0_URI, "locationState");
+    static final QName PROP_LOCATION_COUNTRY = QName.createQName(DATALIST_MODEL_1_0_URI, "locationCountry");
+    
+    /** Meeting Agenda List */
+    static final QName TYPE_MEETING_AGENDA = QName.createQName(DATALIST_MODEL_1_0_URI, "meetingAgenda");
+    static final QName PROP_MEETING_AGENDA_REF = QName.createQName(DATALIST_MODEL_1_0_URI, "meetingAgendaRef");
+    static final QName PROP_MEETING_AGENDA_TIME = QName.createQName(DATALIST_MODEL_1_0_URI, "meetingAgendaTime");
+    static final QName PROP_MEETING_AGENDA_OWNER = QName.createQName(DATALIST_MODEL_1_0_URI, "meetingAgendaOwner");
+    
+    /** Event Agenda List */
+    static final QName TYPE_EVENT_AGENDA = QName.createQName(DATALIST_MODEL_1_0_URI, "eventAgenda");
+    static final QName PROP_EVENT_AGENDA_REF = QName.createQName(DATALIST_MODEL_1_0_URI, "eventAgendaRef");
+    static final QName PROP_EVENT_AGENDA_START_TIME = QName.createQName(DATALIST_MODEL_1_0_URI, "eventAgendaStartTime");
+    static final QName PROP_EVENT_AGENDA_END_TIME = QName.createQName(DATALIST_MODEL_1_0_URI, "eventAgendaEndTime");
+    static final QName PROP_EVENT_AGENDA_SESSION_NAME = QName.createQName(DATALIST_MODEL_1_0_URI, "eventAgendaSessionName");
+    static final QName PROP_EVENT_AGENDA_PRESENTER = QName.createQName(DATALIST_MODEL_1_0_URI, "eventAgendaPresenter");
+    static final QName PROP_EVENT_AGENDA_AUDIENCE = QName.createQName(DATALIST_MODEL_1_0_URI, "eventAgendaAudience");
+    static final QName PROP_EVENT_AGENDA_NOTES = QName.createQName(DATALIST_MODEL_1_0_URI, "eventAgendaNotes");
+}
diff --git a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
index d1e97e221e..7fb48e0749 100644
--- a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
+++ b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
@@ -1270,10 +1270,22 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
         }
 
         // create relationship
-        AssociationRef assocRef = connector.getNodeService().createAssociation(
-                sourceNodeRef, targetNodeRef, type.getAlfrescoClass());
+        // ALF-10085 : disable auditing behaviour for this use case
+        boolean wasEnabled = connector.disableBehaviour(ContentModel.ASPECT_AUDITABLE, sourceNodeRef);        // Lasts for txn
+        try
+        {
+            AssociationRef assocRef = connector.getNodeService().createAssociation(
+                    sourceNodeRef, targetNodeRef, type.getAlfrescoClass());
 
-        return CMISConnector.ASSOC_ID_PREFIX + assocRef.getId();
+            return CMISConnector.ASSOC_ID_PREFIX + assocRef.getId();
+        }
+        finally
+        {
+            if(wasEnabled)
+            {
+                connector.enableBehaviour(ContentModel.ASPECT_AUDITABLE, sourceNodeRef);
+            }
+        }
     }
 
     @Override
diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java
index b9620cd247..c6d1eab2e5 100644
--- a/source/java/org/alfresco/opencmis/CMISConnector.java
+++ b/source/java/org/alfresco/opencmis/CMISConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -36,7 +36,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
@@ -58,6 +57,8 @@ import org.alfresco.opencmis.search.CMISQueryService;
 import org.alfresco.opencmis.search.CMISResultSet;
 import org.alfresco.opencmis.search.CMISResultSetColumn;
 import org.alfresco.opencmis.search.CMISResultSetRow;
+import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.security.permissions.PermissionReference;
@@ -248,12 +249,18 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
     private NamespaceService namespaceService;
     private SearchService searchService;
     private DictionaryService dictionaryService;
+    private BehaviourFilter behaviourFilter;
 
     private StoreRef storeRef;
     private String rootPath;
     private Map<String, List<String>> kindToRenditionNames;
-    private Map<String, NodeRef> rootNodeRefs = new ConcurrentHashMap<String, NodeRef>(1);
-    private Map<String, CMISRenditionMapping> renditionMapping = new ConcurrentHashMap<String, CMISRenditionMapping>(1);
+    
+    // note: caches are tenant-aware (if using EhCacheAdapter shared cache)
+    
+    private SimpleCache<String, Object> singletonCache; // eg. for cmisRootNodeRef, cmisRenditionMapping
+    private final String KEY_CMIS_ROOT_NODEREF = "key.cmisRoot.noderef";
+    private final String KEY_CMIS_RENDITION_MAPPING_NODEREF = "key.cmisRenditionMapping.noderef";
+    
     private String proxyUser;
     private boolean openHttpSession = false;
 
@@ -363,6 +370,11 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
         return descriptorService;
     }
 
+    public void setBehaviourFilter(BehaviourFilter behaviourFilter)
+    {
+        this.behaviourFilter = behaviourFilter;
+    }
+
     /**
      * Sets the node service.
      */
@@ -376,7 +388,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
         return nodeService;
     }
 
-    /**
+	/**
      * Sets the version service.
      */
     public void setVersionService(VersionService versionService)
@@ -456,7 +468,12 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
     {
         this.tenantAdminService = tenantAdminService;
     }
-
+    
+    public void setSingletonCache(SimpleCache<String, Object> singletonCache)
+    {
+        this.singletonCache = singletonCache;
+    }
+    
     /**
      * Sets the transaction service.
      */
@@ -590,13 +607,11 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
 
     public void init()
     {
-        // initialise root node ref
+        // register as tenant deployer
         tenantAdminService.register(this);
 
-        // set up rendition mapping
-        String tenantDomain = tenantAdminService.getCurrentUserDomain();
-        renditionMapping.put(tenantDomain, new CMISRenditionMapping(nodeService, contentService, renditionService,
-                transactionService, kindToRenditionNames));
+        // set up and cache rendition mapping
+        getRenditionMapping();
 
         // cache root node ref
         getRootNodeRef();
@@ -608,7 +623,8 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
 
     public void destroy()
     {
-        rootNodeRefs.remove(tenantAdminService.getCurrentUserDomain());
+        singletonCache.remove(KEY_CMIS_ROOT_NODEREF);
+        singletonCache.remove(KEY_CMIS_RENDITION_MAPPING_NODEREF);
     }
 
     public void onEnableTenant()
@@ -652,6 +668,26 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
     // Alfresco methods
     // --------------------------------------------------------------
 
+    public boolean disableBehaviour(QName className, NodeRef nodeRef)
+    {
+        boolean wasEnabled = behaviourFilter.isEnabled(nodeRef, className);
+        if(wasEnabled)
+        {
+            behaviourFilter.disableBehaviour(nodeRef, className);
+        }
+        return wasEnabled;
+    }
+    
+    public boolean enableBehaviour(QName className, NodeRef nodeRef)
+    {
+        boolean isEnabled = behaviourFilter.isEnabled(nodeRef, className);
+        if(!isEnabled)
+        {
+            behaviourFilter.enableBehaviour(nodeRef, className);
+        }
+        return isEnabled;
+    }
+    
     public StoreRef getRootStoreRef()
     {
         return getRootNodeRef().getStoreRef();
@@ -662,8 +698,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
      */
     public NodeRef getRootNodeRef()
     {
-        String tenantDomain = tenantAdminService.getCurrentUserDomain();
-        NodeRef rootNodeRef = rootNodeRefs.get(tenantDomain);
+        NodeRef rootNodeRef = (NodeRef)singletonCache.get(KEY_CMIS_ROOT_NODEREF);
         if (rootNodeRef == null)
         {
             rootNodeRef = AuthenticationUtil.runAs(new RunAsWork<NodeRef>()
@@ -693,7 +728,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
                 throw new CmisObjectNotFoundException("Root folder path '" + rootPath + "' not found!");
             }
 
-            rootNodeRefs.put(tenantDomain, rootNodeRef);
+            singletonCache.put(KEY_CMIS_ROOT_NODEREF, rootNodeRef);
         }
 
         return rootNodeRef;
@@ -701,8 +736,15 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
 
     public String getName(NodeRef nodeRef)
     {
-        Object name = nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
-        return (name instanceof String ? (String) name : null);
+        try
+        {
+            Object name = nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+            return (name instanceof String ? (String) name : null);
+        }
+        catch(InvalidNodeRefException inre)
+        {
+            return null;
+        }
     }
 
     /**
@@ -769,8 +811,15 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
      */
     public TypeDefinitionWrapper getType(NodeRef nodeRef)
     {
-        QName typeQName = nodeService.getType(nodeRef);
-        return getType(typeQName);
+        try
+        {
+            QName typeQName = nodeService.getType(nodeRef);
+            return getType(typeQName);
+        }
+        catch(InvalidNodeRefException inre)
+        {
+            return null;
+        }
     }
 
     private TypeDefinitionWrapper getType(QName typeQName)
@@ -993,37 +1042,13 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
 
     public String getPath(NodeRef nodeRef)
     {
-        Path path = nodeService.getPath(nodeRef);
-
-        // skip to CMIS root path
-        NodeRef rootNode = getRootNodeRef();
-        int i = 0;
-        while (i < path.size())
+        try
         {
-            Path.Element element = path.get(i);
-            if (element instanceof ChildAssocElement)
-            {
-                ChildAssociationRef assocRef = ((ChildAssocElement) element).getRef();
-                NodeRef node = assocRef.getChildRef();
-                if (node.equals(rootNode))
-                {
-                    break;
-                }
-            }
-            i++;
-        }
+            Path path = nodeService.getPath(nodeRef);
 
-        StringBuilder displayPath = new StringBuilder(64);
-
-        if (path.size() - i == 1)
-        {
-            // render root path
-            displayPath.append("/");
-        }
-        else
-        {
-            // render CMIS scoped path
-            i++;
+            // skip to CMIS root path
+            NodeRef rootNode = getRootNodeRef();
+            int i = 0;
             while (i < path.size())
             {
                 Path.Element element = path.get(i);
@@ -1031,14 +1056,45 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
                 {
                     ChildAssociationRef assocRef = ((ChildAssocElement) element).getRef();
                     NodeRef node = assocRef.getChildRef();
-                    displayPath.append("/");
-                    displayPath.append(nodeService.getProperty(node, ContentModel.PROP_NAME));
+                    if (node.equals(rootNode))
+                    {
+                        break;
+                    }
                 }
                 i++;
             }
-        }
 
-        return displayPath.toString();
+            StringBuilder displayPath = new StringBuilder(64);
+
+            if (path.size() - i == 1)
+            {
+                // render root path
+                displayPath.append("/");
+            }
+            else
+            {
+                // render CMIS scoped path
+                i++;
+                while (i < path.size())
+                {
+                    Path.Element element = path.get(i);
+                    if (element instanceof ChildAssocElement)
+                    {
+                        ChildAssociationRef assocRef = ((ChildAssocElement) element).getRef();
+                        NodeRef node = assocRef.getChildRef();
+                        displayPath.append("/");
+                        displayPath.append(nodeService.getProperty(node, ContentModel.PROP_NAME));
+                    }
+                    i++;
+                }
+            }
+
+            return displayPath.toString();
+        }
+        catch(InvalidNodeRefException inre)
+        {
+            return null;
+        }
     }
 
     /**
@@ -1640,9 +1696,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
     public List<RenditionData> getRenditions(NodeRef nodeRef, String renditionFilter, BigInteger maxItems,
             BigInteger skipCount)
     {
-        String tenantDomain = tenantAdminService.getCurrentUserDomain();
-        CMISRenditionMapping mapping = renditionMapping.get(tenantDomain);
-
+        CMISRenditionMapping mapping = getRenditionMapping();
         return mapping.getRenditions(nodeRef, renditionFilter, maxItems, skipCount);
     }
 
@@ -2823,4 +2877,17 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
 
         return result;
     }
+    
+    private CMISRenditionMapping getRenditionMapping()
+    {
+        CMISRenditionMapping renditionMapping = (CMISRenditionMapping)singletonCache.get(KEY_CMIS_RENDITION_MAPPING_NODEREF);
+        if (renditionMapping == null)
+        {
+            renditionMapping = new CMISRenditionMapping(nodeService, contentService, renditionService,
+                    transactionService, kindToRenditionNames);
+            
+            singletonCache.put(KEY_CMIS_RENDITION_MAPPING_NODEREF, renditionMapping);
+        }
+        return renditionMapping;
+    }
 }
diff --git a/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java b/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java
index b8f1368bdc..5a1618825f 100644
--- a/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java
+++ b/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java
@@ -18,6 +18,7 @@
  */
 package org.alfresco.opencmis;
 
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +32,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.GUID;
 import org.alfresco.util.TempFileProvider;
+import org.apache.chemistry.opencmis.client.api.Document;
 import org.apache.chemistry.opencmis.client.api.Folder;
 import org.apache.chemistry.opencmis.client.api.Repository;
 import org.apache.chemistry.opencmis.client.api.Session;
@@ -145,4 +147,58 @@ public class OpenCmisLocalTest extends TestCase
         }
         folder.createDocument(fileProps, fileContent, VersioningState.MAJOR);
     }
+    
+    public void testALF10085() throws InterruptedException
+    {
+        Repository repository = getRepository("admin", "admin");
+        Session session = repository.createSession();
+        Folder rootFolder = session.getRootFolder();
+
+        Map<String, String> props = new HashMap<String, String>();
+        {
+            props.put(PropertyIds.OBJECT_TYPE_ID, "D:cmiscustom:document");
+            props.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+        }
+        Document doc1 = rootFolder.createDocument(props, null, null);
+        
+        props = new HashMap<String, String>();
+        {
+            props.put(PropertyIds.OBJECT_TYPE_ID, "D:cmiscustom:document");
+            props.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+        }
+        Document doc2 = rootFolder.createDocument(props, null, null);
+        
+        Thread.sleep(6000); 
+        
+        session.getObject(doc1);
+
+        doc1.refresh();
+        Calendar doc1LastModifiedBefore = (Calendar)doc1.getProperty(PropertyIds.LAST_MODIFICATION_DATE).getFirstValue();
+        assertNotNull(doc1LastModifiedBefore);
+
+        doc2.refresh();
+        Calendar doc2LastModifiedBefore = (Calendar)doc2.getProperty(PropertyIds.LAST_MODIFICATION_DATE).getFirstValue();
+        assertNotNull(doc2LastModifiedBefore);
+
+        // Add relationship A to B
+        props = new HashMap<String, String>();
+        {
+            props.put(PropertyIds.OBJECT_TYPE_ID, "R:cmiscustom:assoc");
+            props.put(PropertyIds.NAME, "A Relationship"); 
+            props.put(PropertyIds.SOURCE_ID, doc1.getId()); 
+            props.put(PropertyIds.TARGET_ID, doc2.getId()); 
+        }
+        session.createRelationship(props); 
+
+        doc1.refresh();
+        Calendar doc1LastModifiedAfter = (Calendar)doc1.getProperty(PropertyIds.LAST_MODIFICATION_DATE).getFirstValue();
+        assertNotNull(doc1LastModifiedAfter);
+        
+        doc2.refresh();
+        Calendar doc2LastModifiedAfter = (Calendar)doc2.getProperty(PropertyIds.LAST_MODIFICATION_DATE).getFirstValue();
+        assertNotNull(doc2LastModifiedAfter);
+
+        assertEquals(doc1LastModifiedBefore, doc1LastModifiedAfter);
+        assertEquals(doc2LastModifiedBefore, doc2LastModifiedAfter);
+    }
 }
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MigrateTenantsFromAttrsToTablePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MigrateTenantsFromAttrsToTablePatch.java
new file mode 100644
index 0000000000..8291ce8bce
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/MigrateTenantsFromAttrsToTablePatch.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.admin.patch.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.domain.tenant.TenantAdminDAO;
+import org.alfresco.repo.domain.tenant.TenantEntity;
+import org.alfresco.repo.tenant.MultiTAdminServiceImpl;
+import org.alfresco.service.cmr.attributes.AttributeService;
+import org.alfresco.service.cmr.attributes.AttributeService.AttributeQueryCallback;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * Migrate Tenant attributes to table (alf_tenants)
+ * 
+ * @author janv
+ * @since 4.0
+ */
+public class MigrateTenantsFromAttrsToTablePatch extends AbstractPatch
+{
+    private Log logger = LogFactory.getLog(this.getClass());
+    
+    private static final String MSG_SUCCESS = "patch.migrateTenantsFromAttrsToTable.result";
+    
+    private AttributeService attributeService;
+    private TenantAdminDAO tenantAdminDAO;
+    
+    public void setAttributeService(AttributeService attributeService)
+    {
+        this.attributeService = attributeService;
+    }
+    
+    public void setTenantAdminDAO(TenantAdminDAO tenantAdminDAO)
+    {
+        this.tenantAdminDAO = tenantAdminDAO;
+    }
+    
+    @Override
+    protected String applyInternal() throws Exception
+    {
+        long startTime = System.currentTimeMillis();
+        
+        final List<TenantEntity> tenantsToMigrate = new ArrayList<TenantEntity>(10);
+        
+        attributeService.getAttributes(new AttributeQueryCallback()
+        {
+            public boolean handleAttribute(Long id, Serializable value, Serializable[] keys)
+            {
+                if ((keys.length >= 2) && (value != null))
+                {
+                    String tenantDomain = (String)keys[1];
+                    
+                    @SuppressWarnings("unchecked")
+                    Map<String,Serializable> valueMap = (Map<String,Serializable>)value;
+                    
+                    Boolean isEnabled = (Boolean)valueMap.get(MultiTAdminServiceImpl.TENANT_ATTRIBUTE_ENABLED);
+                    String rootDir = (String)valueMap.get(MultiTAdminServiceImpl.TENANT_ATTRIBUTE_ROOT_CONTENT_STORE_DIR);
+                    
+                    TenantEntity tenantEntity = new TenantEntity(new String(tenantDomain));
+                    tenantEntity.setEnabled((isEnabled != null ? isEnabled : false));
+                    tenantEntity.setContentRoot(new String(rootDir));
+                    
+                    TenantEntity tenantEntityCreated = tenantAdminDAO.createTenant(tenantEntity);
+                    tenantsToMigrate.add(tenantEntityCreated);
+                    
+                    if (logger.isInfoEnabled())
+                    {
+                        logger.info("... migrated: "+tenantEntityCreated);
+                    }
+                }
+                
+                return true;
+            }
+        },
+        MultiTAdminServiceImpl.TENANTS_ATTRIBUTE_PATH);
+        
+        int tenantCount = tenantsToMigrate.size();
+        if (tenantCount > 0)
+        {
+            for (TenantEntity tenantEntity : tenantsToMigrate)
+            {
+                attributeService.removeAttribute(MultiTAdminServiceImpl.TENANTS_ATTRIBUTE_PATH, tenantEntity.getTenantDomain());
+            }
+            
+            final List<String> checkTenants = new ArrayList<String>(10);
+            attributeService.getAttributes(new AttributeQueryCallback()
+            {
+                public boolean handleAttribute(Long id, Serializable value, Serializable[] keys)
+                {
+                    if ((keys.length >= 2) && (value != null))
+                    {
+                        String tenantDomain = (String)keys[1];
+                        logger.error("Unexpected tenant attribute: "+tenantDomain+" [not migrated/removed]");
+                        
+                        checkTenants.add(tenantDomain);
+                    }
+                    
+                    return true;
+                }
+            },
+            MultiTAdminServiceImpl.TENANTS_ATTRIBUTE_PATH);
+            
+            if (checkTenants.size() > 0)
+            {
+                throw new AlfrescoRuntimeException("Incomplete migration of tenant attributes to tenant table: "+checkTenants.size());
+            }
+            
+            tenantAdminService.startTenants();
+            
+            logger.info("Processed "+tenantCount+" Tenant attrs in "+(System.currentTimeMillis()-startTime)/1000+" secs");
+        }
+        
+        // build the result message
+        String msg = I18NUtil.getMessage(MSG_SUCCESS, tenantCount);
+        // done
+        return msg;
+    }
+}
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
index abb96b293a..8f36a21927 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
@@ -73,6 +73,7 @@ public class SiteLoadPatch extends AbstractPatch
     private static final String MSG_NO_BOOTSTRAP_VIEWS_GIVEN = "patch.siteLoadPatch.noBootstrapViews";
     private static final String MSG_SITE_CREATED = "patch.siteLoadPatch.result";
     private static final String MSG_SITE_NOT_CREATED = "patch.siteLoadPatch.siteNotCreated";
+    private static final String MSG_SITE_LOAD_DISABLED = "patch.siteLoadPatch.siteLoadDisabled";
     
     // Logger
     private static final Log logger = LogFactory.getLog(SiteLoadPatch.class);
@@ -89,6 +90,8 @@ public class SiteLoadPatch extends AbstractPatch
     
     private Map<String,Properties> bootstrapViews;
     
+    private Boolean disabled = false;
+    
     public SiteLoadPatch()
     {
         // We do need to run in our own transaction
@@ -157,7 +160,16 @@ public class SiteLoadPatch extends AbstractPatch
         this.behaviourFilter = behaviourFilter;
     }
 
-    @Override
+	public void setDisabled(boolean disabled)
+	{
+		this.disabled = disabled;
+	}
+	
+	public boolean isDisabled() {
+		return disabled;
+	}
+
+	@Override
     protected void checkProperties()
     {
         super.checkProperties();
@@ -169,6 +181,15 @@ public class SiteLoadPatch extends AbstractPatch
     @Override
     protected String applyInternal() throws Exception
     {
+    	//skip sites that we don't want imported automatically
+		if (isDisabled()) 
+		{
+			 if (logger.isDebugEnabled())
+			 {
+				 logger.debug("Load of site \"" + siteName + "\" is disabled.");
+			 }
+			 return I18NUtil.getMessage(MSG_SITE_LOAD_DISABLED, siteName);
+		}
         AuthenticationUtil.pushAuthentication();
         try
         {
diff --git a/source/java/org/alfresco/repo/audit/AuditMethodInterceptor.java b/source/java/org/alfresco/repo/audit/AuditMethodInterceptor.java
index b5c27bbb37..bd5fd5d473 100644
--- a/source/java/org/alfresco/repo/audit/AuditMethodInterceptor.java
+++ b/source/java/org/alfresco/repo/audit/AuditMethodInterceptor.java
@@ -18,6 +18,8 @@
  */
 package org.alfresco.repo.audit;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
@@ -93,6 +95,11 @@ public class AuditMethodInterceptor implements MethodInterceptor
     public static final String AUDIT_SNIPPET_ERROR = "/error";
     public static final String AUDIT_SNIPPET_NO_ERROR = "/no-error";
     
+    private static final String NOT_RECORDABLE = "not auditable";
+    
+    @SuppressWarnings("rawtypes")
+    private static final Class[] NON_RECORDABLE_CLASSES = new Class[] { InputStream.class,  OutputStream.class };
+    
     private static final Log logger = LogFactory.getLog(AuditMethodInterceptor.class);
 
     private BeanIdentifier beanIdentifier;
@@ -296,41 +303,75 @@ public class AuditMethodInterceptor implements MethodInterceptor
                     continue;
                 }
             }
-            Serializable arg;
-            if (args[i] == null)
+            Serializable value = getRecordableValue(args[i]);
+            if (value == NOT_RECORDABLE)
             {
-                arg = null;
-            }
-            else if (args[i] instanceof Serializable)
-            {
-                arg = (Serializable) args[i];
-            }
-            else
-            {
-                // TODO: How to treat non-serializable args
-                // arg = args[i].toString();
-                try
-                {
-                    arg = DefaultTypeConverter.INSTANCE.convert(String.class, args[i]);
-                }
-                catch (TypeConversionException e)
-                {
-                    // No viable conversion
-                    continue;
-                }
-            }
-            // Trim strings
-            if (arg instanceof String)
-            {
-                arg = SchemaBootstrap.trimStringForTextFields((String)arg);
+                // No viable conversion
+                continue;
             }
+
             // It is named and recordable
-            namedArgs.put(params[i], arg);
+            namedArgs.put(params[i], value);
         }
         // Done
         return namedArgs;
     }
     
+    /**
+     * Returns a value that may be included in audit map data. Called for method arguments and return
+     * values. Not all values may be audited. Some cannot be converted to something that can be
+     * serialised or may only be read once (so would be damaged). String audit values may be trimmed.
+     * @param value to be audited.
+     * @return Return {@link NOT_AUDITABLE} if it is not possible to audit the value,a value that may be audited. May be null.
+     * @throws TypeConversionException if not possible to convert the original object.
+     */
+    private Serializable getRecordableValue(Object value)
+    {
+        if (value == null)
+        {
+            return null;
+        }
+        
+        Serializable audit = instanceofNonAuditClass(value);
+        if (audit == null)
+        {
+            if (value instanceof Serializable)
+            {
+                audit = (Serializable) value;
+            }
+            else
+            {
+                try
+                {
+                    audit = DefaultTypeConverter.INSTANCE.convert(String.class, value);
+                }
+                catch (TypeConversionException e)
+                {
+                    return NOT_RECORDABLE;
+                }
+            }
+            // Trim strings
+            if (audit instanceof String)
+            {
+                audit = SchemaBootstrap.trimStringForTextFields((String) audit);
+            }
+        }
+        return audit;
+    }
+    
+    // Returns a non null value if the supplied value is a non auditable class.
+    private Serializable instanceofNonAuditClass(Object value)
+    {
+        for (@SuppressWarnings("rawtypes") Class clazz: NON_RECORDABLE_CLASSES)
+        {
+            if (clazz.isInstance(value))
+            {
+                return NOT_RECORDABLE;
+            }
+        }
+        return null;
+    }
+
     /**
      * Audit values before the invocation
      * 
@@ -413,30 +454,10 @@ public class AuditMethodInterceptor implements MethodInterceptor
             auditData.put(path, entry.getValue());
         }
         
-        if (ret != null)
+        Serializable value = getRecordableValue(ret);
+        if (value != null && value != NOT_RECORDABLE)
         {
-            if (ret instanceof String)
-            {
-                // Make sure the string fits
-                ret = SchemaBootstrap.trimStringForTextFields((String) ret);
-            }
-            if (ret instanceof Serializable)
-            {
-                auditData.put(AUDIT_SNIPPET_RESULT, (Serializable) ret);
-            }
-            else
-            {
-                // TODO: How do we treat non-serializable return values
-                try
-                {
-                    ret = DefaultTypeConverter.INSTANCE.convert(String.class, ret);
-                    auditData.put(AUDIT_SNIPPET_RESULT, (String) ret);
-                }
-                catch (TypeConversionException e)
-                {
-                    // No viable conversion
-                }
-            }
+            auditData.put(AUDIT_SNIPPET_RESULT, value);
         }
 
         if (thrown != null)
diff --git a/source/java/org/alfresco/repo/cache/TransactionalCache.java b/source/java/org/alfresco/repo/cache/TransactionalCache.java
index cf184105fd..69d4747259 100644
--- a/source/java/org/alfresco/repo/cache/TransactionalCache.java
+++ b/source/java/org/alfresco/repo/cache/TransactionalCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -28,6 +28,8 @@ import java.util.Set;
 import net.sf.ehcache.CacheException;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
 import org.alfresco.repo.transaction.TransactionListener;
@@ -76,7 +78,7 @@ public class TransactionalCache<K extends Serializable, V extends Object>
     
     private Log logger;
     private boolean isDebugEnabled;
-
+    
     /** a name used to uniquely identify the transactional caches */
     private String name;
     /** enable/disable write through to the shared cache */
@@ -91,7 +93,9 @@ public class TransactionalCache<K extends Serializable, V extends Object>
     private int maxCacheSize = 500;
     /** a unique string identifying this instance when binding resources */
     private String resourceKeyTxnData;
-
+    
+    private boolean isTenantAware = true; // true if tenant-aware (default), false if system-wide
+    
     /**
      * Public constructor.
      */
@@ -203,7 +207,12 @@ public class TransactionalCache<K extends Serializable, V extends Object>
     {
         this.name = name;
     }
-
+    
+    public void setTenantAware(boolean isTenantAware)
+    {
+        this.isTenantAware = isTenantAware;
+    }
+    
     /**
      * Ensures that all properties have been set
      */
@@ -236,8 +245,8 @@ public class TransactionalCache<K extends Serializable, V extends Object>
         {
             data = new TransactionData();
             // create and initialize caches
-            data.updatedItemsCache = new LRULinkedHashMap<K, CacheBucket<V>>(23);
-            data.removedItemsCache = new HashSet<K>(13);
+            data.updatedItemsCache = new LRULinkedHashMap<Serializable, CacheBucket<V>>(23);
+            data.removedItemsCache = new HashSet<Serializable>(13);
             data.isReadOnly = AlfrescoTransactionSupport.getTransactionReadState() == TxnReadState.TXN_READ_ONLY;
 
             // ensure that we get the transaction callbacks as we have bound the unique
@@ -285,20 +294,25 @@ public class TransactionalCache<K extends Serializable, V extends Object>
      * The keys returned are a union of the set of keys in the current transaction and
      * those in the backing cache.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public Collection<K> getKeys()
     {
-        Collection<K> keys = null;
+        Collection<Serializable> keys = null;
         // in-txn layering
         if (AlfrescoTransactionSupport.getTransactionId() != null)
         {
-            keys = new HashSet<K>(23);
+            keys = new HashSet<Serializable>(23);
             TransactionData txnData = getTransactionData();
             if (!txnData.isClearOn)
             {
                 // the backing cache is not due for a clear
-                Collection<K> backingKeys = (Collection<K>) sharedCache.getKeys();
-                keys.addAll(backingKeys);
+                Collection<K> backingKeys = (Collection<K>)sharedCache.getKeys();
+                Collection<Serializable> backingCacheKeys = new HashSet<Serializable>(backingKeys.size());
+                for (K backingKey : backingKeys)
+                {
+                    backingCacheKeys.add(getCacheKey(backingKey));
+                }
+                keys.addAll(backingCacheKeys);
             }
             // add keys
             keys.addAll(txnData.updatedItemsCache.keySet());
@@ -308,10 +322,29 @@ public class TransactionalCache<K extends Serializable, V extends Object>
         else
         {
             // no transaction, so just use the backing cache
-            keys = (Collection<K>) sharedCache.getKeys();
+            keys = (Collection) sharedCache.getKeys();
+        }
+        
+        Collection<K> cacheKeys = new HashSet<K>(keys.size());
+        String currentCacheRegion = TenantUtil.getCurrentDomain();
+        
+        for (Serializable key : keys)
+        {
+            if (key instanceof CacheRegionKey)
+            {
+                CacheRegionKey cacheRegionKey = (CacheRegionKey)key;
+                if (currentCacheRegion.equals(cacheRegionKey.getCacheRegion()))
+                {
+                    cacheKeys.add((K)cacheRegionKey.getCacheKey());
+                }
+            }
+            else
+            {
+                cacheKeys.add((K)key);
+            }
         }
         // done
-        return keys;
+        return cacheKeys;
     }
     
     /**
@@ -321,7 +354,7 @@ public class TransactionalCache<K extends Serializable, V extends Object>
      * @return              Returns the value or <tt>null</tt>
      */
     @SuppressWarnings("unchecked")
-    private V getSharedCacheValue(K key)
+    private V getSharedCacheValue(Serializable key)
     {
         return (V) sharedCache.get(key);
     }
@@ -330,8 +363,10 @@ public class TransactionalCache<K extends Serializable, V extends Object>
      * Checks the per-transaction caches for the object before going to the shared cache.
      * If the thread is not in a transaction, then the shared cache is accessed directly.
      */
-    public V get(K key)
+    public V get(K keyIn)
     {
+        final Serializable key = getCacheKey(keyIn);
+        
         boolean ignoreSharedCache = false;
         // are we in a transaction?
         if (AlfrescoTransactionSupport.getTransactionId() != null)
@@ -429,8 +464,10 @@ public class TransactionalCache<K extends Serializable, V extends Object>
      * thread and the <tt>Object</tt> put onto that. 
      */
     @SuppressWarnings("unchecked")
-    public void put(K key, V value)
+    public void put(K keyIn, V value)
     {
+        final Serializable key = getCacheKey(keyIn);
+        
         // are we in a transaction?
         if (AlfrescoTransactionSupport.getTransactionId() == null)  // not in transaction
         {
@@ -514,8 +551,10 @@ public class TransactionalCache<K extends Serializable, V extends Object>
      * Where a transaction is present, a cache of removed items is lazily added to the
      * thread and the <tt>Object</tt> put onto that. 
      */
-    public void remove(K key)
+    public void remove(K keyIn)
     {
+        final Serializable key = getCacheKey(keyIn);
+        
         // are we in a transaction?
         if (AlfrescoTransactionSupport.getTransactionId() == null)  // not in transaction
         {
@@ -679,12 +718,12 @@ public class TransactionalCache<K extends Serializable, V extends Object>
                     logger.debug("Removed " + txnData.removedItemsCache.size() + " values from shared cache in commit");
                 }
             }
-
+            
             // transfer updates
-            Set<K> keys = (Set<K>) txnData.updatedItemsCache.keySet();
-            for (Map.Entry<K, CacheBucket<V>> entry : (Set<Map.Entry<K, CacheBucket<V>>>) txnData.updatedItemsCache.entrySet())
+            Set<Serializable> keys = (Set<Serializable>) txnData.updatedItemsCache.keySet();
+            for (Map.Entry<Serializable, CacheBucket<V>> entry : (Set<Map.Entry<Serializable, CacheBucket<V>>>) txnData.updatedItemsCache.entrySet())
             {
-                K key = entry.getKey();
+                Serializable key = entry.getKey();
                 CacheBucket<V> bucket = entry.getValue();
                 bucket.doPreCommit(
                         sharedCache,
@@ -740,12 +779,12 @@ public class TransactionalCache<K extends Serializable, V extends Object>
                     logger.debug("Removed " + txnData.removedItemsCache.size() + " values from shared cache in commit");
                 }
             }
-
+            
             // transfer updates
-            Set<K> keys = (Set<K>) txnData.updatedItemsCache.keySet();
-            for (Map.Entry<K, CacheBucket<V>> entry : (Set<Map.Entry<K, CacheBucket<V>>>) txnData.updatedItemsCache.entrySet())
+            Set<Serializable> keys = (Set<Serializable>) txnData.updatedItemsCache.keySet();
+            for (Map.Entry<Serializable, CacheBucket<V>> entry : (Set<Map.Entry<Serializable, CacheBucket<V>>>) txnData.updatedItemsCache.entrySet())
             {
-                K key = entry.getKey();
+                Serializable key = entry.getKey();
                 CacheBucket<V> bucket = entry.getValue();
                 bucket.doPostCommit(
                         sharedCache,
@@ -1020,8 +1059,8 @@ public class TransactionalCache<K extends Serializable, V extends Object>
     /** Data holder to bind data to the transaction */
     private class TransactionData
     {
-        private LRULinkedHashMap<K, CacheBucket<V>> updatedItemsCache;
-        private Set<K> removedItemsCache;
+        private LRULinkedHashMap<Serializable, CacheBucket<V>> updatedItemsCache;
+        private Set<Serializable> removedItemsCache;
         private boolean haveIssuedFullWarning;
         private boolean isClearOn;
         private boolean isClosed;
@@ -1056,4 +1095,71 @@ public class TransactionalCache<K extends Serializable, V extends Object>
             return (size() > maxCacheSize);
         }
     }
+    
+    private Serializable getCacheKey(final K key)
+    {
+        if (isTenantAware)
+        {
+            final String tenantDomain = TenantUtil.getCurrentDomain();
+            if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
+            {
+                return new CacheRegionKey(tenantDomain, key);
+            }
+            // drop through
+        }
+        return key;
+    }
+    
+    public static class CacheRegionKey implements Serializable
+    {
+        private static final long serialVersionUID = -213050301938804468L;
+        
+        private final String cacheRegion;
+        private final Serializable cacheKey;
+        private final int hashCode;
+        
+        public CacheRegionKey(String cacheRegion, Serializable cacheKey)
+        {
+            this.cacheRegion = cacheRegion;
+            this.cacheKey = cacheKey;
+            this.hashCode = cacheRegion.hashCode() + cacheKey.hashCode();
+        }
+        
+        public Serializable getCacheKey()
+        {
+            return cacheKey;
+        }
+        
+        public String getCacheRegion()
+        {
+            return cacheRegion;
+        }
+        
+        @Override
+        public String toString()
+        {
+            return cacheRegion + (cacheRegion != "" ? "." : "") + cacheKey.toString();
+        }
+        
+        @Override
+        public boolean equals(Object obj)
+        {
+            if (this == obj)
+            {
+                return true;
+            }
+            else if (!(obj instanceof CacheRegionKey))
+            {
+                return false;
+            }
+            CacheRegionKey that = (CacheRegionKey) obj;
+            return this.cacheRegion.equals(that.cacheRegion) && this.cacheKey.equals(that.cacheKey);
+        }
+        
+        @Override
+        public int hashCode()
+        {
+            return hashCode;
+        }
+    }
 }
diff --git a/source/java/org/alfresco/repo/content/ContentServiceImpl.java b/source/java/org/alfresco/repo/content/ContentServiceImpl.java
index 85df8651ac..2d8763e59d 100644
--- a/source/java/org/alfresco/repo/content/ContentServiceImpl.java
+++ b/source/java/org/alfresco/repo/content/ContentServiceImpl.java
@@ -18,8 +18,11 @@
  */
 package org.alfresco.repo.content;
 
+import java.io.File;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -33,6 +36,7 @@ import org.alfresco.repo.content.ContentServicePolicies.OnContentReadPolicy;
 import org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy;
 import org.alfresco.repo.content.cleanup.EagerContentStoreCleaner;
 import org.alfresco.repo.content.filestore.FileContentStore;
+import org.alfresco.repo.content.filestore.FileContentWriter;
 import org.alfresco.repo.content.transform.ContentTransformer;
 import org.alfresco.repo.content.transform.ContentTransformerRegistry;
 import org.alfresco.repo.content.transform.TransformerDebug;
@@ -104,6 +108,7 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
     private ContentTransformer imageMagickContentTransformer;
     /** Should we consider zero byte content to be the same as no content? */
     private boolean ignoreEmptyContent;
+    private boolean transformerFailover;
     
     /**
      * The policy component
@@ -172,6 +177,18 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
         this.ignoreEmptyContent = ignoreEmptyContent;
     }
 
+    /**
+     * Allows fail over form one transformer to another when there is
+     * more than one transformer available. The cost is that the output
+     * of the transformer must go to a temporary file in case it fails.
+     * @param transformerFailover {@code true} indicate that fail over 
+     *        should take place.
+     */
+    public void setTransformerFailover(boolean transformerFailover)
+    {
+        this.transformerFailover = transformerFailover;
+    }
+
     /* (non-Javadoc)
      * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
      */
@@ -584,15 +601,21 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
             List<ContentTransformer> transformers = getActiveTransformers(sourceMimetype, sourceSize, targetMimetype, options);
             transformerDebug.availableTransformers(transformers, sourceSize, "ContentService.transform(...)");
             
-            if (transformers.isEmpty())
+            int count = transformers.size(); 
+            if (count == 0)
             {
                 throw new NoTransformerException(sourceMimetype, targetMimetype);
             }
-
-            // we have a transformer, so do it
-            ContentTransformer transformer = transformers.size() == 0 ? null : transformers.get(0);
-            transformer.transform(reader, writer, options);
-            // done
+            
+            if (count == 1 || !transformerFailover)
+            {
+                ContentTransformer transformer = transformers.size() == 0 ? null : transformers.get(0);
+                transformer.transform(reader, writer, options);
+            }
+            else
+            {
+                failoverTransformers(reader, writer, options, targetMimetype, transformers);
+            }
         }
         finally
         {
@@ -604,6 +627,99 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
         }
     }
 
+    private void failoverTransformers(ContentReader reader, ContentWriter writer,
+            TransformationOptions options, String targetMimetype,
+            List<ContentTransformer> transformers)
+    {
+        List<AlfrescoRuntimeException> exceptions = null;
+        boolean done = false;
+        try
+        {
+            // Try the best transformer and then the next if it fails
+            // and so on down the list
+            char c = 'a';
+            String outputFileExt = mimetypeService.getExtension(targetMimetype);
+            for (ContentTransformer transformer : transformers)
+            {
+                ContentWriter currentWriter = writer;
+                File tempFile = null;
+                try
+                {
+                    // We can't know in advance which of the
+                    // available transformer will work - if any.
+                    // We can't write into the ContentWriter stream.
+                    // So make a temporary file writer with the
+                    // current transformer name.
+                    tempFile = TempFileProvider.createTempFile(
+                            "FailoverTransformer_intermediate_"
+                                    + transformer.getClass().getSimpleName() + "_", "."
+                                    + outputFileExt);
+                    currentWriter = new FileContentWriter(tempFile);
+                    currentWriter.setMimetype(targetMimetype);
+                    currentWriter.setEncoding(writer.getEncoding());
+
+                    if (c != 'a' && transformerDebug.isEnabled())
+                    {
+                        transformerDebug.debug("");
+                        transformerDebug.debug("Try " + c + ")");
+                    }
+                    c++;
+
+                    transformer.transform(reader, currentWriter, options);
+
+                    if (tempFile != null)
+                    {
+                        writer.putContent(tempFile);
+                    }
+
+                    // No need to close input or output streams
+                    // (according
+                    // to comment in FailoverContentTransformer)
+                    done = true;
+                    return;
+                }
+                catch (AlfrescoRuntimeException e)
+                {
+                    if (exceptions == null)
+                    {
+                        exceptions = new ArrayList<AlfrescoRuntimeException>();
+                    }
+                    exceptions.add(e);
+
+                    // Set a new reader to refresh the input stream.
+                    reader = reader.getReader();
+                }
+            }
+            // Throw the exception from the first transformer. The
+            // others are consumed.
+            if (exceptions != null)
+            {
+                throw exceptions.get(0);
+            }
+        }
+        finally
+        {
+            // Log exceptions that we have consumed. We may have thrown the first one if
+            // none of the transformers worked.
+            if (exceptions != null)
+            {
+                boolean first = true;
+                for (Exception e : exceptions)
+                {
+                    if (done)
+                    {
+                        logger.error("Transformer succeeded after previous transformer failed.", e);
+                    }
+                    else if (!first)
+                    {
+                        logger.error("Transformer exception.", e);
+                        first = false;
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * @see org.alfresco.repo.content.transform.ContentTransformerRegistry
      * @see org.alfresco.repo.content.transform.ContentTransformer
@@ -663,8 +779,11 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
         try
         {
             transformerDebug.pushMisc();
-            transformerDebug.debug("Active and inactive transformers (list not reduced by 'explicit' settings)");
+            transformerDebug.debug("Active and inactive transformers");
             TransformationOptions options = new TransformationOptions();
+
+            Map<String, Set<String>> explicitTransforms = debugExplicitTransforms();
+
             for (ContentTransformer transformer: transformerRegistry.getTransformers())
             {
                 try
@@ -680,8 +799,18 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
                             {
                                 long maxSourceSizeKBytes = transformer.getMaxSourceSizeKBytes(
                                         sourceMimetype, targetMimetype, options);
-                                boolean explicit = transformer.isExplicitTransformation(sourceMimetype,
+                                
+                                // Is this an explicit transform, ignored because there are explicit transforms
+                                // or does not have explicit transforms.
+                                Boolean explicit = transformer.isExplicitTransformation(sourceMimetype,
                                         targetMimetype, options);
+                                if (!explicit)
+                                {
+                                    Set<String> targetMimetypes = explicitTransforms.get(sourceMimetype);
+                                    explicit = (targetMimetypes == null || !targetMimetypes.contains(targetMimetype))
+                                        ? null
+                                        : Boolean.FALSE;
+                                }
                                 transformerDebug.activeTransformer(++mimetypePairCount, transformer,
                                         sourceMimetype, targetMimetype, maxSourceSizeKBytes, explicit, first);
                                 first = false;
@@ -704,6 +833,43 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
             transformerDebug.popMisc();
         }
     }
+
+    /**
+     * Returns the explicit mimetype transformations. Key is the source mimetype
+     * and the value is a set of target mimetypes that are explicit.
+     */
+    private Map<String, Set<String>> debugExplicitTransforms()
+    {
+        Map<String, Set<String>> explicitTransforms = new HashMap<String, Set<String>>();
+
+        TransformationOptions options = new TransformationOptions();
+        for (String sourceMimetype : mimetypeService.getMimetypes())
+        {
+            for (String targetMimetype : mimetypeService.getMimetypes())
+            {
+                for (ContentTransformer transformer : transformerRegistry.getTransformers())
+                {
+                    if (transformer.isTransformable(sourceMimetype, -1, targetMimetype, options))
+                    {
+                        if (transformer.isExplicitTransformation(sourceMimetype, targetMimetype,
+                                options))
+                        {
+                            Set<String> targetMimetypes = explicitTransforms.get(sourceMimetype);
+                            if (targetMimetypes == null)
+                            {
+                                targetMimetypes = new HashSet<String>();
+                                explicitTransforms.put(sourceMimetype, targetMimetypes);
+                            }
+                            targetMimetypes.add(targetMimetype);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        
+        return explicitTransforms;
+    }
     
     /**
      * {@inheritDoc}
diff --git a/source/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java b/source/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java
index 2334a6657e..ea441098cd 100644
--- a/source/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java
+++ b/source/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java
@@ -351,11 +351,13 @@ public abstract class AbstractContentTransformerLimits extends ContentTransforme
         TransformationOptionLimits mimetypeLimits = null;
         if (this.mimetypeLimits != null)
         {
+            boolean anySource = false;
             Map<String, TransformationOptionLimits> targetLimits =
                 this.mimetypeLimits.get(sourceMimetype);
             if (targetLimits == null)
             {
                 targetLimits = this.mimetypeLimits.get("*");
+                anySource = true;
             }
             if (targetLimits != null)
             {
@@ -363,6 +365,22 @@ public abstract class AbstractContentTransformerLimits extends ContentTransforme
                 if (mimetypeLimits == null)
                 {
                     mimetypeLimits = targetLimits.get("*");
+                    
+                    // Allow for the case where have specific source and target mimetype limits
+                    // and general source limits (avoid having to repeat the general values in
+                    // each specific source definition)
+                    if (mimetypeLimits == null && !anySource)
+                    {
+                        targetLimits = this.mimetypeLimits.get("*");
+                        if (targetLimits != null)
+                        {
+                            mimetypeLimits = targetLimits.get(targetMimetype);
+                            if (mimetypeLimits == null)
+                            {
+                                mimetypeLimits = targetLimits.get("*");
+                            }
+                        }
+                    }
                 }
             }
         }
diff --git a/source/java/org/alfresco/repo/content/transform/TransformerDebug.java b/source/java/org/alfresco/repo/content/transform/TransformerDebug.java
index b56b64a0b0..08cc2e7186 100644
--- a/source/java/org/alfresco/repo/content/transform/TransformerDebug.java
+++ b/source/java/org/alfresco/repo/content/transform/TransformerDebug.java
@@ -249,18 +249,16 @@ public class TransformerDebug
         {
             frame.callType = Call.AVAILABLE_AND_TRANSFORM;
         }
-        else
-        {
-            // Create a new frame. Logging level is set to trace if the file size is 0
-            boolean origDebugOutput = ThreadInfo.setDebugOutput(ThreadInfo.getDebugOutput() && sourceSize != 0);
-            frame = new Frame(frame, fromUrl, sourceMimetype, targetMimetype, options, callType, origDebugOutput);
-            ourStack.push(frame);
+
+        // Create a new frame. Logging level is set to trace if the file size is 0
+        boolean origDebugOutput = ThreadInfo.setDebugOutput(ThreadInfo.getDebugOutput() && sourceSize != 0);
+        frame = new Frame(frame, fromUrl, sourceMimetype, targetMimetype, options, callType, origDebugOutput);
+        ourStack.push(frame);
             
-            if (callType == Call.TRANSFORM)
-            {
-                // Log the basic info about this transformation
-                logBasicDetails(frame, sourceSize, name, (ourStack.size() == 1));
-            }
+        if (callType == Call.TRANSFORM)
+        {
+            // Log the basic info about this transformation
+            logBasicDetails(frame, sourceSize, name, (ourStack.size() == 1));
         }
     }
     
@@ -320,9 +318,12 @@ public class TransformerDebug
             for (ContentTransformer trans : transformers)
             {
                 String name = getName(trans);
-                int pad = longestNameLength - name.length();
-                log((c == 'a' ? "**" : "  ") + (c++) + ") " +
-                    name + spaces(pad+1) + ms(trans.getTransformationTime()));
+                int padName = longestNameLength - name.length() + 1;
+                long maxSourceSizeKBytes = trans.getMaxSourceSizeKBytes(frame.sourceMimetype, frame.targetMimetype, frame.options);
+                String size = maxSourceSizeKBytes > 0 ? "< "+fileSize(maxSourceSizeKBytes*1024) : "";
+                int padSize = 10 - size.length();
+                log((c == 'a' ? "**" : "  ") + (c++) + ") " + name + spaces(padName) + 
+                    size + spaces(padSize) + ms(trans.getTransformationTime()));
             }
             if (frame.unavailableTransformers != null)
             {
@@ -342,7 +343,7 @@ public class TransformerDebug
     }
 
     public void activeTransformer(int mimetypePairCount, ContentTransformer transformer, String sourceMimetype,
-            String targetMimetype, long maxSourceSizeKBytes, boolean explicit, boolean firstMimetypePair)
+            String targetMimetype, long maxSourceSizeKBytes, Boolean explicit, boolean firstMimetypePair)
     {
         if (firstMimetypePair)
         {
@@ -351,7 +352,8 @@ public class TransformerDebug
         String i = Integer.toString(mimetypePairCount);
         log(spaces(5-i.length())+mimetypePairCount+") "+getMimetypeExt(sourceMimetype)+getMimetypeExt(targetMimetype)+
                 ' '+fileSize((maxSourceSizeKBytes > 0) ? maxSourceSizeKBytes*1024 : maxSourceSizeKBytes)+
-                (explicit ? " EXPLICIT" : ""));
+                (maxSourceSizeKBytes == 0 || (explicit != null && !explicit) ? " disabled" : "")+ 
+                (explicit == null ? "" : explicit ? " EXPLICIT" : " not explicit"));
     }
     
     private int getLongestTransformerNameLength(List<ContentTransformer> transformers,
diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java b/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java
index ea4e5cc707..e1b2d58951 100644
--- a/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java
+++ b/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -242,7 +242,7 @@ public class DictionaryRepositoryBootstrap extends AbstractLifecycleBean impleme
                 
                 if (! nodeService.exists(storeRef))
                 {
-                    logger.warn("StoreRef '"+ storeRef+"' does not exist");
+                    logger.info("StoreRef '"+ storeRef+"' does not exist");
                     continue; // skip this location
                 }
                 
@@ -347,7 +347,7 @@ public class DictionaryRepositoryBootstrap extends AbstractLifecycleBean impleme
                 
                 if (! nodeService.exists(storeRef))
                 {
-                    logger.warn("StoreRef '"+ storeRef+"' does not exist");
+                    logger.info("StoreRef '"+ storeRef+"' does not exist");
                     continue; // skip this location
                 }
                 
@@ -391,7 +391,7 @@ public class DictionaryRepositoryBootstrap extends AbstractLifecycleBean impleme
             
             if (! nodeService.exists(storeRef))
             {
-                logger.warn("StoreRef '"+ storeRef+"' does not exist");
+                logger.info("StoreRef '"+ storeRef+"' does not exist");
                 continue; // skip this location
             }
             
diff --git a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
index f381c2bcc7..22835c2eef 100644
--- a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
@@ -1716,4 +1716,30 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
             template.delete(DELETE_SUBSCRIPTIONS, nodeId);
         }
     }
+    
+    /**
+     * MySQL-specific DAO overrides
+     */
+    public static class MySQL extends NodeDAOImpl
+    {
+        private static final String DELETE_TXNS_UNUSED_MYSQL = "alfresco.node.delete_Txns_Unused_MySQL";
+
+        private SqlSessionTemplate template;
+        
+        public final void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate) 
+        {
+            super.setSqlSessionTemplate(sqlSessionTemplate);
+            this.template = sqlSessionTemplate;
+        }
+
+        @Override
+        public int deleteTxnsUnused(long fromCommitTime, long toCommitTime)
+        {
+            TransactionQueryEntity txnQuery = new TransactionQueryEntity();
+            txnQuery.setMinCommitTime(fromCommitTime);
+            txnQuery.setMaxCommitTime(toCommitTime);
+            int numDeleted = template.delete(DELETE_TXNS_UNUSED_MYSQL, txnQuery);
+            return numDeleted;
+        }
+    }
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/domain/permissions/ADMPermissionsDaoComponentImpl.java b/source/java/org/alfresco/repo/domain/permissions/ADMPermissionsDaoComponentImpl.java
index a6e96ebc11..2002974b83 100644
--- a/source/java/org/alfresco/repo/domain/permissions/ADMPermissionsDaoComponentImpl.java
+++ b/source/java/org/alfresco/repo/domain/permissions/ADMPermissionsDaoComponentImpl.java
@@ -47,10 +47,10 @@ public class ADMPermissionsDaoComponentImpl extends AbstractPermissionsDaoCompon
             properties.setAclType(ACLType.DEFINING);
             properties.setInherits(inherit);
             properties.setVersioned(false);
-            
+
             Acl acl = aclDaoComponent.createAccessControlList(properties);
             long id = acl.getId();
-            
+
             List<AclChange> changes = new ArrayList<AclChange>();
             changes.add(new AclDAOImpl.AclChangeImpl(null, id, null, acl.getAclType()));
             changes.addAll(getACLDAO(nodeRef).setInheritanceForChildren(nodeRef, id, null));
@@ -75,16 +75,16 @@ public class ADMPermissionsDaoComponentImpl extends AbstractPermissionsDaoCompon
             properties.setAclType(ACLType.DEFINING);
             properties.setInherits(existing.getInherits());
             properties.setVersioned(false);
-            
+
             acl = aclDaoComponent.createAccessControlList(properties);
             id = acl.getId();
-            
+
             changes = new ArrayList<AclChange>();
             changes.add(new AclDAOImpl.AclChangeImpl(existing.getId(), id, existing.getAclType(), acl.getAclType()));
             changes.addAll(aclDaoComponent.mergeInheritedAccessControlList(existing.getId(), id));
             // set this to inherit to children
             changes.addAll(getACLDAO(nodeRef).setInheritanceForChildren(nodeRef, id, aclDaoComponent.getInheritedAccessControlList(existing.getId())));
-            
+
             getACLDAO(nodeRef).setAccessControlList(nodeRef, acl);
             return new CreationReport(acl, changes);
         case LAYERED:
@@ -93,7 +93,7 @@ public class ADMPermissionsDaoComponentImpl extends AbstractPermissionsDaoCompon
             throw new IllegalStateException("Unknown type " + existing.getAclType());
         }
     }
-    
+
     public void deletePermissions(NodeRef nodeRef)
     {
         Acl acl = null;
@@ -112,32 +112,27 @@ public class ADMPermissionsDaoComponentImpl extends AbstractPermissionsDaoCompon
             case OLD:
                 throw new IllegalStateException("Can not mix old and new style permissions");
             case DEFINING:
-                if (acl.getInheritsFrom() != null)
+                if (acl.getInherits())
                 {
-                    Long inheritsFrom = acl.getInheritsFrom();
-                    getACLDAO(nodeRef).setAccessControlList(nodeRef, aclDaoComponent.getAcl(inheritsFrom));
-                    List<AclChange> changes = new ArrayList<AclChange>();
-                    changes.addAll(getACLDAO(nodeRef).setInheritanceForChildren(nodeRef, inheritsFrom, aclDaoComponent.getInheritedAccessControlList(acl.getId())));
-                    getACLDAO(nodeRef).updateChangedAcls(nodeRef, changes);
-                    aclDaoComponent.deleteAccessControlList(acl.getId());
-                }
+                    // Check the primary parent to set inheritance
+                    Long inheritsFrom = getACLDAO(nodeRef).getInheritedAcl(nodeRef);
+                    if(inheritsFrom != null)
+                    {
+                        inheritsFrom = aclDaoComponent.getInheritedAccessControlList(inheritsFrom);
+                        getACLDAO(nodeRef).setAccessControlList(nodeRef, aclDaoComponent.getAcl(inheritsFrom));
+                        List<AclChange> changes = new ArrayList<AclChange>();
+                        changes.addAll(getACLDAO(nodeRef).setInheritanceForChildren(nodeRef, inheritsFrom, aclDaoComponent.getInheritedAccessControlList(acl.getId())));
+                        getACLDAO(nodeRef).updateChangedAcls(nodeRef, changes);
+                        aclDaoComponent.deleteAccessControlList(acl.getId());
+                    }
+                    else
+                    {
+                        replaceWithCleanDefiningAcl(nodeRef, acl);
+                    }
+                } 
                 else
                 {
-                    // TODO: could just clear out existing
-                    SimpleAccessControlListProperties properties = new SimpleAccessControlListProperties();
-                    properties = new SimpleAccessControlListProperties();
-                    properties.setAclType(ACLType.DEFINING);
-                    properties.setInherits(Boolean.FALSE);
-                    properties.setVersioned(false);
-                    
-                    Acl newAcl = aclDaoComponent.createAccessControlList(properties);
-                    long id = newAcl.getId();
-                    
-                    getACLDAO(nodeRef).setAccessControlList(nodeRef, newAcl);
-                    List<AclChange> changes = new ArrayList<AclChange>();
-                    changes.addAll(getACLDAO(nodeRef).setInheritanceForChildren(nodeRef, id, acl.getInheritedAcl()));
-                    getACLDAO(nodeRef).updateChangedAcls(nodeRef, changes);
-                    aclDaoComponent.deleteAccessControlList(acl.getId());
+                    replaceWithCleanDefiningAcl(nodeRef, acl);
                 }
                 break;
             case FIXED:
@@ -154,4 +149,28 @@ public class ADMPermissionsDaoComponentImpl extends AbstractPermissionsDaoCompon
             }
         }
     }
+
+
+    /**
+     * @param nodeRef
+     * @param acl
+     */
+    private void replaceWithCleanDefiningAcl(NodeRef nodeRef, Acl acl)
+    {
+        // TODO: could just clear out existing
+        SimpleAccessControlListProperties properties = new SimpleAccessControlListProperties();
+        properties = new SimpleAccessControlListProperties();
+        properties.setAclType(ACLType.DEFINING);
+        properties.setInherits(Boolean.FALSE);
+        properties.setVersioned(false);
+
+        Acl newAcl = aclDaoComponent.createAccessControlList(properties);
+        long id = newAcl.getId();
+
+        getACLDAO(nodeRef).setAccessControlList(nodeRef, newAcl);
+        List<AclChange> changes = new ArrayList<AclChange>();
+        changes.addAll(getACLDAO(nodeRef).setInheritanceForChildren(nodeRef, id, acl.getInheritedAcl()));
+        getACLDAO(nodeRef).updateChangedAcls(nodeRef, changes);
+        aclDaoComponent.deleteAccessControlList(acl.getId());
+    }
 }
diff --git a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
index 13b2fecd2e..f0127c2cdb 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
@@ -776,16 +776,16 @@ public class AclDAOImpl implements AclDAO
                 Long aclMemberId = member.getId();
                 Long aclId = member.getAclId();
                 Long aceId = member.getAceId();
-
+                
                 boolean hasAnotherTenantNodes = false;
                 if (AuthenticationUtil.isMtEnabled())
                 {
                     // ALF-3563
-
+                    
                     // Retrieve dependent nodes
                     List<Long> nodeIds = aclCrudDAO.getADMNodesByAcl(aclId, -1);
                     nodeIds.addAll(aclCrudDAO.getAVMNodesByAcl(aclId, -1));
-
+                    
                     if (nodeIds.size() > 0)
                     {
                         for (Long nodeId : nodeIds)
@@ -796,23 +796,25 @@ public class AclDAOImpl implements AclDAO
                                 logger.warn("Node does not exist: " + nodeId);
                                 continue;
                             }
-                            NodeRef nodeRef = nodePair.getSecond();
-
-                            try
+                            else
                             {
-                                // Throws AlfrescoRuntimeException in case of domain mismatch
-                                tenantService.checkDomain(nodeRef.getStoreRef().getIdentifier());
-                            }
-                            catch (AlfrescoRuntimeException e)
-                            {
-                                hasAnotherTenantNodes = true;
-                                leaveAuthority = true;
-                                break;
+                                NodeRef nodeRef = nodePair.getSecond();
+                                try
+                                {
+                                    // Throws AlfrescoRuntimeException in case of domain mismatch
+                                    tenantService.checkDomain(nodeRef.getStoreRef().getIdentifier());
+                                }
+                                catch (AlfrescoRuntimeException e)
+                                {
+                                    hasAnotherTenantNodes = true;
+                                    leaveAuthority = true;
+                                    break;
+                                }
                             }
                         }
                     }
                 }
-
+                
                 if (!hasAnotherTenantNodes)
                 {
                     aclCache.remove(aclId);
diff --git a/source/java/org/alfresco/repo/domain/tenant/AbstractTenantAdminDAOImpl.java b/source/java/org/alfresco/repo/domain/tenant/AbstractTenantAdminDAOImpl.java
index 4f4763f86c..650c0eb0d8 100644
--- a/source/java/org/alfresco/repo/domain/tenant/AbstractTenantAdminDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/tenant/AbstractTenantAdminDAOImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -133,6 +133,9 @@ public abstract class AbstractTenantAdminDAOImpl implements TenantAdminDAO
         TenantUpdateEntity updateEntity = new TenantUpdateEntity(entity.getTenantDomain());
         updateEntity.setVersion(entity.getVersion());
         updateEntity.setEnabled(entity.getEnabled());
+        updateEntity.setContentRoot(entity.getContentRoot());
+        updateEntity.setDbUrl(entity.getDbUrl());
+        updateEntity.setTenantName(entity.getTenantName());
         
         return updateEntity;
     }
diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java
index 0866c46437..f35615d0d1 100644
--- a/source/java/org/alfresco/repo/jscript/ScriptNode.java
+++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java
@@ -2138,7 +2138,19 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
         QName aspectQName = createQName(type);
         if (aspectQName.equals(ContentModel.ASPECT_VERSIONABLE))
         {
-            ensureVersioningEnabled(true, true);
+            // ALF-13719 need to taking into account script properties for versionable aspect
+            if (aspectProps != null)
+            {
+                Serializable autoVersionObj, autoVersionPropsObj;
+                autoVersionObj = aspectProps.get(ContentModel.PROP_AUTO_VERSION);
+                autoVersionPropsObj = aspectProps.get(ContentModel.PROP_AUTO_VERSION_PROPS);
+                ensureVersioningEnabled(autoVersionObj instanceof Boolean ? ((Boolean) autoVersionObj) : true,
+                        autoVersionPropsObj instanceof Boolean ? ((Boolean) autoVersionPropsObj) : true);
+            }
+            else
+            {
+                ensureVersioningEnabled(true, true);
+            }
         }
         else
         {
@@ -2859,7 +2871,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
      * 
      * @return  String[]    array of thumbnail names that are valid for the current content type
      */
-    public String[] getThumbnailDefintions()
+    public String[] getThumbnailDefinitions()
     {
         ContentService contentService = this.services.getContentService();
         ThumbnailService thumbnailService = this.services.getThumbnailService();
@@ -2879,6 +2891,15 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
         
         return (String[])result.toArray(new String[result.size()]);
     }
+    /**
+     * This version of the method name spelling is retained (for now) for backwards compatibility
+     * @see #getThumbnailDefinitions() 
+     */
+    @Deprecated
+    public String[] getThumbnailDefintions()
+    {
+        return getThumbnailDefinitions();
+    }
     
     
     // ------------------------------------------------------------------------------
diff --git a/source/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java b/source/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
index 680c94281c..ef9d6d0f46 100644
--- a/source/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
+++ b/source/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
@@ -78,7 +78,7 @@ public class UsernamePropertyDecorator extends BasePropertyDecorator
 
         map.put("firstName", firstName);
         map.put("lastName", lastName);
-        map.put("displayName", (firstName != null ? firstName + " " : "" + lastName != null ? lastName : "").replaceAll("^\\s+|\\s+$", ""));
+        map.put("displayName", ((firstName != null ? firstName + " " : "") + (lastName != null ? lastName : "")).replaceAll("^\\s+|\\s+$", ""));
         return map;
     }
 }
diff --git a/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java b/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java
index 30d9777d1f..ca13a16e7d 100644
--- a/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java
+++ b/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java
@@ -28,7 +28,6 @@ import org.alfresco.repo.lock.LockAcquisitionException;
 import org.alfresco.repo.node.db.DbNodeServiceImpl;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
@@ -122,7 +121,7 @@ public abstract class AbstractNodeCleanupWorker implements NodeCleanupWorker
             lockToken.set(token);
             
             // Do the work
-            return doCleanWithTxn();
+            return doCleanAsSystem();
         }
         catch (LockAcquisitionException e)
         {
@@ -163,20 +162,21 @@ public abstract class AbstractNodeCleanupWorker implements NodeCleanupWorker
         }
     }
     
-    private List<String> doCleanWithTxn()
+    private List<String> doCleanAsSystem()
     {
-        final RetryingTransactionCallback<List<String>> doCleanCallback = new RetryingTransactionCallback<List<String>>()
-        {
-            public List<String> execute() throws Throwable
-            {
-                return doCleanInternal();
-            }
-        };
         final RunAsWork<List<String>> doCleanRunAs = new RunAsWork<List<String>>()
         {
             public List<String> doWork() throws Exception
             {
-                return transactionService.getRetryingTransactionHelper().doInTransaction(doCleanCallback, false, true);
+                try
+                {
+                    return doCleanInternal();
+                }
+                catch (Throwable e)
+                {
+                    logger.error(e);
+                    return Collections.emptyList();
+                }
             }
         };
         return AuthenticationUtil.runAs(doCleanRunAs, AuthenticationUtil.getSystemUserName());
diff --git a/source/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java b/source/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java
index e3da0d993c..ccef92cfb3 100644
--- a/source/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java
+++ b/source/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java
@@ -19,9 +19,9 @@ import org.alfresco.service.ServiceRegistry;
 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.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
@@ -53,6 +53,7 @@ public class TransactionCleanupTest
     public void before()
     {
     	ServiceRegistry serviceRegistry = (ServiceRegistry)ctx.getBean("ServiceRegistry");
+        NamespaceService namespaceService = serviceRegistry.getNamespaceService();
 		this.transactionService = serviceRegistry.getTransactionService();
 		this.authenticationService = (MutableAuthenticationService)ctx.getBean("authenticationService");
 		this.nodeService = serviceRegistry.getNodeService();
@@ -65,9 +66,10 @@ public class TransactionCleanupTest
         authenticationService.authenticate("admin", "admin".toCharArray());
 
 		StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
-		ResultSet resultSet = searchService.query(storeRef, SearchService.LANGUAGE_LUCENE, "PATH:\"/app:company_home\"");
-		final NodeRef companyHome = resultSet.getNodeRef(0);
-		resultSet.close();
+		NodeRef storeRoot = nodeService.getRootNode(storeRef);
+		List<NodeRef> nodeRefs = searchService.selectNodes(
+		        storeRoot, "/app:company_home", null, namespaceService, false);
+		final NodeRef companyHome = nodeRefs.get(0);
 
     	RetryingTransactionHelper.RetryingTransactionCallback<NodeRef> createNode = new RetryingTransactionHelper.RetryingTransactionCallback<NodeRef>()
     	{
diff --git a/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java b/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
index 438acb8fa5..f7c04b3e83 100644
--- a/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
+++ b/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
@@ -111,6 +111,35 @@ public class XSLTRenderingEngineTest extends BaseAlfrescoSpringTest
         	fail();
         }
     }
+    
+    public void testIncludeSecurityFilter() throws Exception 
+    {
+    	try
+    	{
+            FileInfo file = createXmlFile(companyHome);
+            FileInfo insecureXSLFile = createXmlFile(companyHome, insecureVerySimpleXSLT);
+
+            String includeInsecureXSLFile = String.format(insecureIncludeVerySimpleXSLT, insecureXSLFile.getName());
+            FileInfo xslFile = createXmlFile(companyHome, includeInsecureXSLFile);
+            
+            RenditionDefinition def = renditionService.createRenditionDefinition(QName.createQName("Test"), XSLTRenderingEngine.NAME);
+            def.setParameterValue(XSLTRenderingEngine.PARAM_TEMPLATE_NODE, xslFile.getNodeRef());
+
+            ChildAssociationRef rendition = renditionService.render(file.getNodeRef(), def);
+            log.error("This insecure include template should not process!");
+    		fail();
+    	}
+    	catch (TemplateException e) 
+    	{
+    		//pass!
+    	}
+        catch (Exception ex)
+        {
+
+        	log.error("Error!", ex);
+        	fail();
+        }
+    }
 
     public void testSimplestStringTemplate() throws Exception
     {
@@ -357,6 +386,13 @@ public class XSLTRenderingEngineTest extends BaseAlfrescoSpringTest
     "<xsl:template match=\"/\">" + "<xsl:for-each select=\"/nutrition/food\">"
     + "<xsl:value-of select=\"name\"/>" + "</xsl:for-each>" + "</xsl:template>" + "</xsl:stylesheet>";
 
+    private String insecureIncludeVerySimpleXSLT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<xsl:stylesheet version=\"1.0\"  "
+    + "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >"
+    + "<xsl:template match=\"/\">"		
+	+ "</xsl:template>"
+    + "<xsl:include href=\"%1$s\"/>"
+    + "</xsl:stylesheet>";
+    
     private String callParseXmlDocument = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<xsl:stylesheet version=\"1.0\"  "
     + "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" "
     + "xmlns:fn=\"http://www.w3.org/2005/02/xpath-functions\"> " + "<xsl:output method=\"text\" />" +
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java
index 4328804a99..cc3a49f6a7 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java
@@ -353,7 +353,7 @@ public class ADMLuceneCategoryTest extends TestCase
         indexer.setDictionaryService(dictionaryService);
         indexer.setTenantService(tenantService);
         indexer.setFullTextSearchIndexer(luceneFTS);
-        //indexer.clearIndex();
+        indexer.deleteIndex(rootNodeRef.getStoreRef());
         indexer.createNode(new ChildAssociationRef(null, null, null, rootNodeRef));
         indexer.createNode(new ChildAssociationRef(ContentModel.ASSOC_CHILDREN, rootNodeRef, QName.createQName("{namespace}one"), n1));
         indexer.createNode(new ChildAssociationRef(ContentModel.ASSOC_CHILDREN, rootNodeRef, QName.createQName("{namespace}two"), n2));
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java
index 2054c48b30..467c357fb2 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java
@@ -84,6 +84,8 @@ import org.alfresco.service.cmr.search.ResultSetRow;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.QNamePattern;
+import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.util.CachingDateFormat;
 import org.alfresco.util.EqualsHelper;
 import org.alfresco.util.GUID;
@@ -760,27 +762,26 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
                 @Override
                 public Void doWork() throws Exception
                 {
+                    // Remember if we have already cascaded
+                    boolean cascaded = false;
+
                     // We we must cope with the possibility of the container not existing for some of this node's parents
-                    for (ChildAssociationRef assocRef: nodeService.getParentAssocs(nodeRef))
+                    for (ChildAssociationRef assocRef : nodeService.getParentAssocs(nodeRef))
                     {
                         NodeRef parentRef = tenantService.getName(assocRef.getParentRef());
                         if (!childAssociationsSinceFlush.containsKey(parentRef))
                         {
                             String parentRefSString = parentRef.toString();
-                            if (!locateContainer(parentRefSString, deltaReader)
-                                    && !locateContainer(parentRefSString, mainReader))
+                            if (!locateContainer(parentRefSString, deltaReader) && (containerDeletions.contains(parentRefSString) || !locateContainer(parentRefSString, mainReader)))
                             {
-                                generateContainersAndBelow(nodeService.getPaths(parentRef, false), docs, false,
-                                        pathsProcessedSinceFlush, childAssociationsSinceFlush);
+                                generateContainersAndBelow(nodeService.getPaths(parentRef, false), docs, cascade, pathsProcessedSinceFlush, childAssociationsSinceFlush);
+                                cascaded = cascade;
                             }
                         }
                     }
                     
-                    // Now regenerate the containers for this node, cascading if necessary
-                    // Only process 'containers' - not leaves
-                    if (isCategory(getDictionaryService().getType(nodeService.getType(nodeRef)))
-                            || mayHaveChildren(nodeRef)
-                            && !getCachedChildren(childAssociationsSinceFlush, nodeRef).isEmpty())
+                    // Now regenerate the containers for this node if necessary
+                    if (cascade && !cascaded || isCategory(getDictionaryService().getType(nodeService.getType(nodeRef))))
                     {
                         generateContainersAndBelow(nodeService.getPaths(nodeRef, false), docs, cascade,
                                 pathsProcessedSinceFlush, childAssociationsSinceFlush);
@@ -1004,7 +1005,7 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
         // Cache the children in case there are many paths to the same node
         if (children == null)
         {
-            children = nodeService.getChildAssocs(nodeRef);
+            children = nodeService.getChildAssocs(nodeRef, RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false);
             for (ChildAssociationRef childRef : children)
             {
                 // We don't want index numbers in generated paths
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
index 0459a1a30a..7d15c0cfed 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
@@ -3778,11 +3778,12 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
         indexer.setContentService(contentService);
         indexer.setTransactionService(transactionService);
 
-        // //indexer.clearIndex();
+        indexer.deleteIndex(rootNodeRef.getStoreRef());
 
         indexer.createNode(new ChildAssociationRef(null, null, null, rootNodeRef));
         indexer.createNode(new ChildAssociationRef(ContentModel.ASSOC_CHILDREN, rootNodeRef, QName.createQName("{namespace}one"), n1));
         indexer.createNode(new ChildAssociationRef(ContentModel.ASSOC_CHILDREN, rootNodeRef, QName.createQName("{namespace}two"), n2));
+        indexer.createNode(new ChildAssociationRef(ASSOC_TYPE_QNAME, n1, QName.createQName("{namespace}five"), n5));
         indexer.updateNode(n1);
         // indexer.deleteNode(new ChildRelationshipRef(rootNode, "path",
         // newNode));
@@ -3962,7 +3963,7 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
         indexer.setTransactionService(transactionService);
         indexer.setTransformerDebug(transformerDebug);
         
-        // indexer.clearIndex();
+        indexer.deleteIndex(rootNodeRef.getStoreRef());
         indexer.createNode(new ChildAssociationRef(null, null, null, rootNodeRef));
         indexer.createNode(new ChildAssociationRef(ContentModel.ASSOC_CHILDREN, rootNodeRef, QName.createQName("{namespace}one"), n1));
         indexer.createNode(new ChildAssociationRef(ContentModel.ASSOC_CHILDREN, rootNodeRef, QName.createQName("{namespace}two"), n2));
diff --git a/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java b/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
index 62bf5e319a..c022567bd6 100644
--- a/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
+++ b/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -101,7 +101,8 @@ public class AuthenticationTest extends TestCase
 
     private PolicyComponent policyComponent;
 
-    private SimpleCache<String, NodeRef> authenticationCache;    
+    private SimpleCache<String, NodeRef> authenticationCache;
+    private SimpleCache<String, NodeRef> immutableSingletonCache;
 
     public AuthenticationTest()
     {
@@ -137,6 +138,7 @@ public class AuthenticationTest extends TestCase
         personService =  (PersonService) ctx.getBean("personService");
         policyComponent = (PolicyComponent) ctx.getBean("policyComponent");
         authenticationCache = (SimpleCache<String, NodeRef>) ctx.getBean("authenticationCache");
+        immutableSingletonCache = (SimpleCache<String, NodeRef>) ctx.getBean("immutableSingletonCache");
         // permissionServiceSPI = (PermissionServiceSPI)
         // ctx.getBean("permissionService");
         ticketsCache = (SimpleCache<String, Ticket>) ctx.getBean("ticketsCache");
@@ -182,7 +184,8 @@ public class AuthenticationTest extends TestCase
         dao.setPasswordEncoder(passwordEncoder);
         dao.setPolicyComponent(policyComponent);
         dao.setAuthenticationCache(authenticationCache);
-
+        dao.setSingletonCache(immutableSingletonCache);
+        
         if (dao.getUserOrNull("andy") != null)
         {
             dao.deleteUser("andy");
@@ -399,6 +402,8 @@ public class AuthenticationTest extends TestCase
         dao.setPasswordEncoder(passwordEncoder);
         dao.setPolicyComponent(policyComponent);
         dao.setAuthenticationCache(authenticationCache);
+        dao.setSingletonCache(immutableSingletonCache);
+        
         dao.createUser("Andy", "cabbage".toCharArray());
         assertNotNull(dao.getUserOrNull("Andy"));
 
diff --git a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
index 7fc5e57c82..2d453489e0 100644
--- a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
+++ b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
@@ -23,7 +23,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import net.sf.acegisecurity.GrantedAuthority;
 import net.sf.acegisecurity.GrantedAuthorityImpl;
@@ -67,12 +66,14 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
     private TenantService tenantService;
     private NamespacePrefixResolver namespacePrefixResolver;
     private PasswordEncoder passwordEncoder;
-    private PolicyComponent policyComponent;    
-
-    /** User folder ref cache (Tennant aware) */
-    private Map<String, NodeRef> userFolderRefs = new ConcurrentHashMap<String, NodeRef>(4);
+    private PolicyComponent policyComponent;
     
-    private SimpleCache<String, NodeRef> authenticationCache;    
+    // note: caches are tenant-aware (if using EhCacheAdapter shared cache)
+    
+    private SimpleCache<String, NodeRef> singletonCache; // eg. for user folder nodeRef
+    private final String KEY_USERFOLDER_NODEREF = "key.userfolder.noderef";
+    
+    private SimpleCache<String, NodeRef> authenticationCache;
     
     public RepositoryAuthenticationDao()
     {
@@ -98,7 +99,12 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
     {
         this.tenantService = tenantService;
     }
-
+    
+    public void setSingletonCache(SimpleCache<String, NodeRef> singletonCache)
+    {
+        this.singletonCache = singletonCache;
+    }
+    
     public void setPasswordEncoder(PasswordEncoder passwordEncoder)
     {
         this.passwordEncoder = passwordEncoder;
@@ -199,18 +205,17 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
         nodeService.createNode(typesNode, ContentModel.ASSOC_CHILDREN, QName.createQName(ContentModel.USER_MODEL_URI,
                 caseSensitiveUserName), ContentModel.TYPE_USER, properties);
     }
-
+    
     private NodeRef getUserFolderLocation(String caseSensitiveUserName)
     {
-        String cacheKey = tenantService.getUserDomain(caseSensitiveUserName);
-        NodeRef userNodeRef = userFolderRefs.get(cacheKey);
+        NodeRef userNodeRef = singletonCache.get(KEY_USERFOLDER_NODEREF);
         if (userNodeRef == null)
         {
             QName qnameAssocSystem = QName.createQName("sys", "system", namespacePrefixResolver);
-            QName qnameAssocUsers = QName.createQName("sys", "people", namespacePrefixResolver); // see
-    
+            QName qnameAssocUsers = QName.createQName("sys", "people", namespacePrefixResolver);
+            
             StoreRef userStoreRef = tenantService.getName(caseSensitiveUserName, new StoreRef(STOREREF_USERS.getProtocol(), STOREREF_USERS.getIdentifier()));
-    
+            
             // AR-527
             NodeRef rootNode = nodeService.getRootNode(userStoreRef);
             List<ChildAssociationRef> results = nodeService.getChildAssocs(rootNode, RegexQNamePattern.MATCH_ALL, qnameAssocSystem);
@@ -232,7 +237,7 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
             {
                 userNodeRef = tenantService.getName(results.get(0).getChildRef());
             }
-            userFolderRefs.put(cacheKey, userNodeRef);            
+            singletonCache.put(KEY_USERFOLDER_NODEREF, userNodeRef);
         }
         return userNodeRef;
     }
diff --git a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java
index 100913d3b5..a94f4de415 100644
--- a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java
+++ b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java
@@ -59,12 +59,12 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
      * Service registry to get hold of public services (so that actions are audited)
      */
     private ServiceRegistry serviceRegistry;
-
+    
     /**
      * The path to a folder
      */
     private String path;
-
+    
     /**
      * The owner to set on creation of a home folder (if unset this will be the uid).
      */
@@ -85,6 +85,11 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
      */
     private V2Adaptor v2Adaptor = new V2Adaptor(this);
 
+    public AbstractHomeFolderProvider()
+    {
+        super();
+    }
+
     /**
      * Register with the homeFolderManagewr
      */
@@ -191,7 +196,7 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
     {
         this.serviceRegistry = serviceRegistry;
     }
-
+    
     /**
      * Set the tenant service
      */
@@ -199,7 +204,7 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
     {
         // keep class signature but no longer use value
     }
-
+    
     /**
      * Set the permission manager
      */
@@ -252,7 +257,7 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
     {
         return homeFolderManager.getRootPathNodeRef(v2Adaptor);
     }
-
+    
     /**
      * Utility method to resolve paths to nodes.
      */
diff --git a/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java b/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
index 12875d301e..3177774ca4 100644
--- a/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
+++ b/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
@@ -520,6 +520,17 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
                 }
             }
 
+            @Override
+            protected void handleRootOrAbove()
+            {
+                if (logger.isInfoEnabled())
+                {
+                    logger.info("     # "+userName+" has a home folder that is the provider's root directory (or is above it). " +
+                    		"This is normally for users that origanally had an internal provider or a provider that uses " +
+                    		"shared home folders - These are not moved.");
+                }
+            }
+            
             @Override
             protected void handleNotAHomeFolderProvider2()
             {
@@ -562,22 +573,29 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
         StringBuilder sb = new StringBuilder("");
         if (folders != null)
         {
-            for (String folder : folders)
+            if (folders.isEmpty())
             {
-                if (sb.length() > 0)
+                sb.append('.');
+            }
+            else
+            {
+                for (String folder : folders)
                 {
-                    sb.append('/');
-                }
-                sb.append(folder);
-                if (depth-- <= 0)
-                {
-                    break;
+                    if (sb.length() > 0)
+                    {
+                        sb.append('/');
+                    }
+                    sb.append(folder);
+                    if (depth-- <= 0)
+                    {
+                        break;
+                    }
                 }
             }
         }
         else
         {
-            sb.append('.');
+            sb.append("<notUnderSameRoot>");
         }
         return sb.toString();
     }
@@ -588,14 +606,25 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
         List<String> path = getRelativePath(root, leaf);
         if (path != null)
         {
-            for (String folder : path)
+            if (path.isEmpty())
             {
-                if (sb.length() > 0)
-                {
-                    sb.append('/');
-                }
-                sb.append(folder);
+                sb.append('.');
             }
+            else
+            {
+                for (String folder : path)
+                {
+                    if (sb.length() > 0)
+                    {
+                        sb.append('/');
+                    }
+                    sb.append(folder);
+                }
+            }
+        }
+        else
+        {
+            sb.append("<notUnderSameRoot>");
         }
         return sb.toString();
     }
@@ -603,7 +632,8 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
     /**
      * @return the relative 'path' (a list of folder names) of the {@code homeFolder}
      * from the {@code root} or {@code null} if the homeFolder is not under the root
-     * or is the root.
+     * or is the root. An empty list is returned if the homeFolder is the same as the
+     * root or the root is below the homeFolder.
      */
     private List<String> getRelativePath(NodeRef root, NodeRef homeFolder)
     {
@@ -612,13 +642,18 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
             return null;
         }
         
+        if (root.equals(homeFolder))
+        {
+            return Collections.emptyList();
+        }
+        
         Path rootPath = nodeService.getPath(root);
         Path homeFolderPath = nodeService.getPath(homeFolder);
         int rootSize = rootPath.size();
         int homeFolderSize = homeFolderPath.size();
         if (rootSize >= homeFolderSize)
         {
-            return null;
+            return Collections.emptyList();
         }
         
         // Check homeFolder is under root
@@ -676,7 +711,7 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
                         " "+ toPath(preferredPath)+
                         ((providerName != null && !providerName.equals(originalProviderName))
                         ? "    # AND reset provider to "+providerName
-                        : "") + ".");
+                        : ""));
             }
 
             // Perform the move
@@ -962,8 +997,13 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
                             else
                             {
                                 actualPath = getRelativePath(root, homeFolder);
-                                
-                                if (preferredPath.equals(actualPath))
+
+                                if (actualPath != null && actualPath.isEmpty())
+                                {
+                                    handleRootOrAbove();
+                                }
+                                else 
+                                    if (preferredPath.equals(actualPath))
                                 {
                                     handleInPreferredLocation();
                                 }
@@ -1002,6 +1042,10 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
         {
         }
         
+        protected void handleRootOrAbove()
+        {
+        }
+        
         protected void handleNotAHomeFolderProvider2()
         { 
         }
diff --git a/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java b/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
index 46539e60c0..2c52ea2579 100644
--- a/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
+++ b/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -321,15 +322,22 @@ public class HomeFolderProviderSynchronizerTest
                 properties.put(ContentModel.PROP_FIRSTNAME, firstName);
                 properties.put(ContentModel.PROP_LASTNAME, lastName);
                 properties.put(ContentModel.PROP_EMAIL, emailAddress);
-                properties.put(ContentModel.PROP_HOME_FOLDER_PROVIDER, testHomeFolderProviderName);
-                properties.put(PROP_PARENT_PATH, parentPath);
+                if (parentPath != null)
+                {
+                    properties.put(ContentModel.PROP_HOME_FOLDER_PROVIDER, testHomeFolderProviderName);
+                    properties.put(PROP_PARENT_PATH, parentPath);
+                }
+                else
+                {
+                    properties.put(ContentModel.PROP_HOME_FOLDER_PROVIDER, homeFolderProviderName);
+                }
                 personService.setHomeFolderCreationEager(createHomeDirectory);
                 NodeRef person = personService.createPerson(properties);
                 assertNotNull("The person nodeRef for "+domainUsername+" should have been created", person);
                 NodeRef homeFolder = DefaultTypeConverter.INSTANCE.convert(
                         NodeRef.class, nodeService.getProperty(person,
                         ContentModel.PROP_HOMEFOLDER));
-                if (createHomeDirectory)
+                if (createHomeDirectory && parentPath != null)
                 {
                     assertNotNull("The homeFolder for "+domainUsername+" should have been created", homeFolder);
                 }
@@ -413,6 +421,11 @@ public class HomeFolderProviderSynchronizerTest
             return null;
         }
         
+        if (root.equals(homeFolder))
+        {
+            return ".";
+        }
+        
         Path rootPath = nodeService.getPath(root);
         Path homeFolderPath = nodeService.getPath(homeFolder);
         int rootSize = rootPath.size();
@@ -519,8 +532,10 @@ public class HomeFolderProviderSynchronizerTest
                     NodeRef person = personService.getPerson(domainUsername, false);
                     NodeRef homeFolder = DefaultTypeConverter.INSTANCE.convert(NodeRef.class,
                             nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER));
-                    assertNotNull("User: "+domainUsername+" home folder should exist", homeFolder);
-
+                    if (expectedPath != null)
+                    {
+                        assertNotNull("User: "+domainUsername+" home folder should exist", homeFolder);
+                    }
                     NodeRef rootPath = homeFolderManager.getRootPathNodeRef(largeHomeFolderProvider);
                     String actualPath = toPath(rootPath, homeFolder);
                     assertEquals("User: "+domainUsername+" home folder location", expectedPath, actualPath);
@@ -798,6 +813,8 @@ public class HomeFolderProviderSynchronizerTest
     @Test
     public void testPathNotUnderRoot() throws Exception
     {
+        System.out.println("-------------- testPathNotUnderRoot --------------");
+        
         createUser("a/b/c", "fred");
 
         createFolder("root");
@@ -811,6 +828,46 @@ public class HomeFolderProviderSynchronizerTest
         assertHomeFolderLocation("fred", "fr/fred");
     }
     
+    @Test
+    public void testPathIsRoot() throws Exception
+    {
+        System.out.println("-------------- testPathIsRoot --------------");
+        
+        createUser("", "fred");
+
+        createFolder("root");
+        String rootPath = origRootPath + "/cm:fred";
+        largeHomeFolderProvider.setRootPath(rootPath);
+
+        assertHomeFolderLocation("fred", ".");
+
+        moveUserHomeFolders();
+
+        assertHomeFolderLocation("fred", ".");
+    }
+    
+    @Test
+    public void testPathIsAboveRoot() throws Exception
+    {
+        System.out.println("-------------- testPathIsAboveRoot --------------");
+        
+        createUser("", "fred");
+
+        createFolder("fred/under1/under2");
+        String rootPath = origRootPath + "/cm:fred/cm:under1/cm:under2";
+        String origRootPath = largeHomeFolderProvider.getRootPath();
+        largeHomeFolderProvider.setRootPath(rootPath);
+
+        assertHomeFolderLocation("fred", null);
+
+        moveUserHomeFolders();
+
+        assertHomeFolderLocation("fred", null);
+
+        largeHomeFolderProvider.setRootPath(origRootPath);
+        assertHomeFolderLocation("fred", "fred");
+    }
+    
     @Test
     public void testMultipleUsers() throws Exception
     {
@@ -910,7 +967,6 @@ public class HomeFolderProviderSynchronizerTest
         v1Provider.setPath(largeHomeFolderProvider.getRootPath());
         v1Provider.setServiceRegistry(serviceRegistry);
         v1Provider.setStoreUrl(largeHomeFolderProvider.getStoreUrl());
-        v1Provider.setTenantService(tenantService);
         v1Provider.afterPropertiesSet();
 
         createUser("a/b/c", "fred");
diff --git a/source/java/org/alfresco/repo/security/person/PortableHomeFolderManager.java b/source/java/org/alfresco/repo/security/person/PortableHomeFolderManager.java
index 91cec9aa15..f4c81dfb1b 100644
--- a/source/java/org/alfresco/repo/security/person/PortableHomeFolderManager.java
+++ b/source/java/org/alfresco/repo/security/person/PortableHomeFolderManager.java
@@ -22,10 +22,9 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.model.FileFolderUtil;
 import org.alfresco.service.cmr.model.FileInfo;
@@ -52,7 +51,6 @@ public class PortableHomeFolderManager implements HomeFolderManager
     private FileFolderService fileFolderService;
     private NamespaceService namespaceService;
     private SearchService searchService;
-    private TenantService tenantService;
     
     /**
      * A default provider
@@ -73,9 +71,11 @@ public class PortableHomeFolderManager implements HomeFolderManager
     /**
      * Cache the result of the path look up.
      */
-    private Map<String, Map<String, NodeRef>> rootPathNodeRefMaps =
-        new ConcurrentHashMap<String, Map<String, NodeRef>>();
-
+    // note: cache is tenant-aware (if using EhCacheAdapter shared cache)
+    
+    private SimpleCache<String, NodeRef> singletonCache; // eg. for rootPathNodeRef
+    private final String KEY_HOME_PATH_NODEREF = "key.homeFolder.rootPathNodeRef";
+    
     /**
      * Set the node service.
      */
@@ -108,12 +108,9 @@ public class PortableHomeFolderManager implements HomeFolderManager
         this.searchService = searchService;
     }
 
-    /**
-     * Set the tenant service
-     */
-    public void setTenantService(TenantService tenantService)
+    public void setSingletonCache(SimpleCache<String, NodeRef> singletonCache)
     {
-        this.tenantService = tenantService;
+        this.singletonCache = singletonCache;
     }
 
     /**
@@ -281,37 +278,23 @@ public class PortableHomeFolderManager implements HomeFolderManager
     
     void clearCaches(HomeFolderProvider2 provider)
     {
-        getRootPathNodeRefMap(provider).clear();
+        String key = KEY_HOME_PATH_NODEREF + "." + provider.getName();
+        singletonCache.remove(key);
     }
     
     NodeRef getRootPathNodeRef(HomeFolderProvider2 provider)
     {
-        String rootPath = provider.getRootPath();
-        String tenantDomain = (tenantService != null ? tenantService.getCurrentUserDomain() : TenantService.DEFAULT_DOMAIN);
-        Map<String, NodeRef> rootPathNodeRefMap = getRootPathNodeRefMap(provider);
-        NodeRef rootPathNodeRef = rootPathNodeRefMap.get(tenantDomain);
+        String key = KEY_HOME_PATH_NODEREF + "." + provider.getName();
+        NodeRef rootPathNodeRef = singletonCache.get(key);
         if (rootPathNodeRef == null)
         {
             // ok with race condition for initial construction
-            rootPathNodeRef = resolvePath(provider, rootPath);
-            rootPathNodeRefMap.put(tenantDomain, rootPathNodeRef);
+            rootPathNodeRef = resolvePath(provider, provider.getRootPath());
+            singletonCache.put(KEY_HOME_PATH_NODEREF, rootPathNodeRef);
         }
         return rootPathNodeRef;
     }
     
-    private Map<String, NodeRef> getRootPathNodeRefMap(HomeFolderProvider2 provider)
-    {
-        String name = provider.getName();
-        Map<String, NodeRef> rootPathNodeRefMap = rootPathNodeRefMaps.get(name);
-        if (rootPathNodeRefMap == null)
-        {
-            // ok with race condition for initial construction
-            rootPathNodeRefMap = new ConcurrentHashMap<String, NodeRef>();
-            rootPathNodeRefMaps.put(name, rootPathNodeRefMap);
-        }
-        return rootPathNodeRefMap;
-    }
-
     /**
      * Utility method to resolve paths to nodes.
      */
diff --git a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
index 545735c709..fe9e80bf51 100644
--- a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
+++ b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
@@ -756,14 +756,20 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                     getContainedAuthorities(parent);
                 }
 
-                // Return the cached children if it is now processed
-                children = this.finalGroupChildAssocs.get(groupName);
+                // Now descend on unprocessed parents.
+                return cacheContainedAuthorities(groupName);
+            }
+
+            private Set<String> cacheContainedAuthorities(String groupName)
+            {
+                // Return the cached children if it is processed
+                Set<String> children = this.finalGroupChildAssocs.get(groupName);
                 if (children != null)
                 {
                     return children;
                 }
 
-                // Now descend on unprocessed parents.
+                // Descend on unprocessed parents.
                 children = ChainingUserRegistrySynchronizer.this.authorityService.getContainedAuthorities(null,
                         groupName, true);
                 this.finalGroupChildAssocs.put(groupName, children);
@@ -772,7 +778,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                 {
                     if (AuthorityType.getAuthorityType(child) != AuthorityType.USER)
                     {
-                        getContainedAuthorities(child);
+                        cacheContainedAuthorities(child);
                     }
                 }
                 return children;
diff --git a/source/java/org/alfresco/repo/template/XSLTProcessor.java b/source/java/org/alfresco/repo/template/XSLTProcessor.java
index 619b5342f3..3aa91a90a3 100644
--- a/source/java/org/alfresco/repo/template/XSLTProcessor.java
+++ b/source/java/org/alfresco/repo/template/XSLTProcessor.java
@@ -49,6 +49,7 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.util.XMLUtil;
 import org.apache.bsf.BSFManager;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.xml.utils.Constants;
@@ -201,7 +202,7 @@ public class XSLTProcessor extends BaseProcessor implements TemplateProcessor
                         throw new TransformerException("unable to resolve href " + href);
                     }
 
-                    Document d = XMLUtil.parse(in);
+                    Document d = XMLUtil.secureParseXSL(in);
                     if (log.isDebugEnabled())
                     {
                         log.debug("loaded " + XMLUtil.toString(d));
@@ -240,7 +241,12 @@ public class XSLTProcessor extends BaseProcessor implements TemplateProcessor
                 final StringBuilder msg = new StringBuilder("errors encountered creating tranformer ... \n");
                 for (TransformerException te : errors)
                 {
-                    msg.append(te.getMessageAndLocation()).append("\n");
+                    msg.append("message: " + te.getMessageAndLocation()).append("\n");
+                    String cause = ExceptionUtils.getRootCauseMessage(te);
+                	if (cause != null) 
+                	{
+                		msg.append(" caused by: " + cause);
+                	}
                 }
                 throw new TemplateException(msg.toString());
             }
@@ -284,6 +290,11 @@ public class XSLTProcessor extends BaseProcessor implements TemplateProcessor
             for (TransformerException te : errors)
             {
                 msg.append(te.getMessageAndLocation()).append("\n");
+                String cause = ExceptionUtils.getRootCauseMessage(te);
+            	if (cause != null) 
+            	{
+            		msg.append(" caused by: " + cause);
+            	}
             }
             throw new TemplateException(msg.toString());
         }
diff --git a/source/java/org/alfresco/repo/template/XSLTProcessorTest.java b/source/java/org/alfresco/repo/template/XSLTProcessorTest.java
index e7a0d18444..3cef815dba 100644
--- a/source/java/org/alfresco/repo/template/XSLTProcessorTest.java
+++ b/source/java/org/alfresco/repo/template/XSLTProcessorTest.java
@@ -100,6 +100,36 @@ public class XSLTProcessorTest extends BaseAlfrescoSpringTest
             fail();
         }
     }
+    
+    public void testIncludeSecurityFilter() throws Exception 
+    {
+    	try
+    	{
+            FileInfo file = createXmlFile(companyHome);
+            FileInfo insecureXSLFile = createXmlFile(companyHome, insecureVerySimpleXSLT);
+            
+            String includeInsecureXSLTemplate = String.format(insecureIncludeVerySimpleXSLT, insecureXSLFile.getName());
+            FileInfo includeInsecureXSLFile = createXmlFile(companyHome, includeInsecureXSLTemplate);
+            
+            XSLTemplateModel model = new XSLTemplateModel();
+            model.put(XSLTProcessor.ROOT_NAMESPACE, XMLUtil.parse(file.getNodeRef(), contentService));
+
+            StringWriter writer = new StringWriter();
+            xsltProcessor.process(includeInsecureXSLFile.getNodeRef().toString(), model, writer);
+            log.error("This insecure include template should not process!");
+            fail();
+    	}
+    	catch (TemplateException e) 
+    	{
+    		//pass!
+    	}
+        catch (Exception ex)
+        {
+
+        	log.error("Error!", ex);
+        	fail();
+        }
+    }
 
     public void testSimplestStringTemplate() throws Exception
     {
@@ -293,6 +323,13 @@ public class XSLTProcessorTest extends BaseAlfrescoSpringTest
             "<xsl:template match=\"/\">" + "<xsl:for-each select=\"/nutrition/food\">"
             + "<xsl:value-of select=\"name\"/>" + "</xsl:for-each>" + "</xsl:template>" + "</xsl:stylesheet>";
     
+    private String insecureIncludeVerySimpleXSLT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<xsl:stylesheet version=\"1.0\"  "
+    	    + "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >"
+    	    + "<xsl:template match=\"/\">"		
+    		+ "</xsl:template>"
+    	    + "<xsl:include href=\"%1$s\"/>"
+    	    + "</xsl:stylesheet>";
+    
     private String insecureVerySimpleXSLT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<xsl:stylesheet version=\"1.0\"  "
     + "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" "
     + "xmlns:rt=\"http://xml.apache.org/xalan/java/java.lang.Runtime\"> "
diff --git a/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java b/source/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java
similarity index 54%
rename from source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java
rename to source/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java
index 37197e7eb8..2e2c2cbf01 100644
--- a/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java
+++ b/source/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -16,20 +16,20 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.repo.content;
+package org.alfresco.repo.tenant;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
-import org.alfresco.repo.content.filestore.FileContentStore;
+import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.repo.content.AbstractRoutingContentStore;
+import org.alfresco.repo.content.ContentContext;
+import org.alfresco.repo.content.ContentStore;
+import org.alfresco.repo.domain.tenant.TenantAdminDAO;
+import org.alfresco.repo.domain.tenant.TenantEntity;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.tenant.Tenant;
-import org.alfresco.repo.tenant.TenantDeployer;
-import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -39,15 +39,16 @@ import org.springframework.context.ApplicationContextAware;
  * 
  * Note: Need to initialise before the dictionary service, in the case that models are dynamically loaded for the tenant.
  */
-public class TenantRoutingFileContentStore extends AbstractRoutingContentStore implements TenantDeployer, ApplicationContextAware
+public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingContentStore implements ApplicationContextAware, TenantRoutingContentStore
 {
-    // cache of tenant file stores
-    Map<String, FileContentStore> tenantFileStores = new ConcurrentHashMap<String, FileContentStore>();
-    
     private String defaultRootDirectory;
+    private TenantAdminDAO tenantAdminDAO;
     private TenantService tenantService;
     private ApplicationContext applicationContext;
     
+    // note: cache is tenant-aware (if using EhCacheAdapter shared cache)
+    private SimpleCache<String, ContentStore> singletonCache; // eg. for contentStore
+    private final String KEY_CONTENT_STORE = "key.tenant.routing.content.store";
     
     public void setDefaultRootDir(String defaultRootDirectory)
     {
@@ -58,7 +59,17 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
     {
         this.tenantService = tenantService;
     }
-
+    
+    public void setTenantAdminDAO(TenantAdminDAO tenantAdminDAO)
+    {
+        this.tenantAdminDAO = tenantAdminDAO;
+    }
+    
+    public void setSingletonCache(SimpleCache<String, ContentStore> singletonCache)
+    {
+        this.singletonCache = singletonCache;
+    }
+    
     /*
      * (non-Javadoc)
      * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.
@@ -72,7 +83,7 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
     @Override
     protected ContentStore selectWriteStore(ContentContext ctx)
     {
-        return getTenantFileStore(tenantService.getCurrentUserDomain());
+        return getTenantContentStore();
     }
     
     @Override
@@ -83,50 +94,62 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
             String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
             if ((currentUser == null) || (tenantService.getBaseNameUser(currentUser).equals(AuthenticationUtil.getSystemUserName())))
             {
-                // return enabled stores across all tenants, if running as system/null user, for example, ContentStoreCleaner scheduled job      
-                List<ContentStore> allEnabledStores = new ArrayList<ContentStore>();
-                for (String tenantDomain : tenantFileStores.keySet())
+                // return enabled stores across all tenants, if running as system/null user, for example, ContentStoreCleaner scheduled job
+                final List<ContentStore> allEnabledStores = new ArrayList<ContentStore>();
+                
+                List<TenantEntity> tenants = tenantAdminDAO.listTenants();
+                for (TenantEntity tenant : tenants)
                 {
-                    allEnabledStores.add(tenantFileStores.get(tenantDomain)); // note: cache should only contain enabled stores
+                    if (tenant.getEnabled())
+                    {
+                        String tenantDomain = tenant.getTenantDomain();
+                        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+                        {
+                            public Void doWork() throws Exception
+                            {
+                                allEnabledStores.add(getTenantContentStore()); // note: cache should only contain enabled stores
+                                return null;
+                            }
+                        }, tenantDomain);
+                    }
                 }
                 
                 if (allEnabledStores.size() > 0)
                 {
+                    allEnabledStores.add(getTenantContentStore());
                     return allEnabledStores;
                 }
                 
                 // drop through to ensure default content store has been init'ed
             }
         }
-        return Arrays.asList(getTenantFileStore(tenantService.getCurrentUserDomain()));
+        return Arrays.asList(getTenantContentStore());
     }
     
-    private ContentStore getTenantFileStore(String tenantDomain)
+    private ContentStore getTenantContentStore()
     {
-        ContentStore cs = tenantFileStores.get(tenantDomain);
+        ContentStore cs = (ContentStore)singletonCache.get(KEY_CONTENT_STORE);
         if (cs == null)
         {
             init();
-            cs = tenantFileStores.get(tenantDomain);
+            cs = (ContentStore)singletonCache.get(KEY_CONTENT_STORE);
         }
         return cs;
     }
     
-    private void putTenantFileStore(String tenantDomain, FileContentStore fileStore)
+    private void putTenantContentStore(ContentStore contentStore)
     {
-        tenantFileStores.put(tenantDomain, fileStore);
+        singletonCache.put(KEY_CONTENT_STORE, contentStore);
     }
     
-    private void removeTenantFileStore(String tenantDomain)
+    private void removeTenantContentStore()
     {
-        tenantFileStores.remove(tenantDomain);
+        singletonCache.remove(KEY_CONTENT_STORE);
     }
     
     public void init()
     {
-        String tenantDomain = TenantService.DEFAULT_DOMAIN;
         String rootDir = defaultRootDirectory;
-        
         Tenant tenant = tenantService.getTenant(tenantService.getCurrentUserDomain());
         if (tenant != null)
         {
@@ -134,15 +157,14 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
             {
                rootDir = tenant.getRootContentStoreDir();
             }
-            tenantDomain = tenant.getTenantDomain();
         }
         
-        putTenantFileStore(tenantDomain, new FileContentStore(this.applicationContext, new File(rootDir)));
+        putTenantContentStore(initContentStore(this.applicationContext, rootDir));
     }
     
     public void destroy()
     {
-        removeTenantFileStore(tenantService.getCurrentUserDomain());
+        removeTenantContentStore();
     }
     
     public void onEnableTenant()
@@ -159,4 +181,6 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
     {
         return this.defaultRootDirectory;
     }
+    
+    protected abstract ContentStore initContentStore(ApplicationContext ctx, String contentRoot);
 }
diff --git a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java
index b7019b3027..edaa02c9cf 100644
--- a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java
+++ b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java
@@ -32,7 +32,6 @@ import net.sf.acegisecurity.providers.encoding.PasswordEncoder;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.admin.RepoModelDefinition;
-import org.alfresco.repo.content.TenantRoutingFileContentStore;
 import org.alfresco.repo.dictionary.DictionaryComponent;
 import org.alfresco.repo.domain.tenant.TenantAdminDAO;
 import org.alfresco.repo.domain.tenant.TenantEntity;
@@ -350,7 +349,7 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo
         AuthenticationUtil.setMtEnabled(true); // in case this is the 1st tenant
         
         long start = System.currentTimeMillis();
-        
+
         initTenant(tenantDomain, rootContentStoreDir);
         
         try
@@ -1155,11 +1154,11 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo
         }
         else
         {
-        	File tenantRootDir = new File(rootContentStoreDir);
-        	if ((tenantRootDir.exists()) && (tenantRootDir.list().length != 0))
-        	{
-        		throw new AlfrescoRuntimeException("Tenant root directory is not empty: " + rootContentStoreDir);
-        	}
+            File tenantRootDir = new File(rootContentStoreDir);
+            if ((tenantRootDir.exists()) && (tenantRootDir.list().length != 0))
+            {
+                logger.warn("Tenant root directory is not empty: " + rootContentStoreDir);
+            }
         }
         
         // init - need to enable tenant (including tenant service) before stores bootstrap
diff --git a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
index af94c2d7f5..8f517362cc 100644
--- a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
+++ b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -32,8 +32,8 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ParameterCheck;
 import org.springframework.extensions.surf.util.I18NUtil;
-import org.springframework.extensions.surf.util.ParameterCheck;
 
 /*
  * MT Service implementation
@@ -55,7 +55,7 @@ public class MultiTServiceImpl implements TenantService
     public NodeRef getName(NodeRef nodeRef)
     {
         if (nodeRef == null) { return null; }
-
+        
         return new NodeRef(nodeRef.getStoreRef().getProtocol(), getName(nodeRef.getStoreRef().getIdentifier()), nodeRef.getId());
     }
     
@@ -65,16 +65,16 @@ public class MultiTServiceImpl implements TenantService
     public NodeRef getName(NodeRef inNodeRef, NodeRef nodeRef)
     {
         if (inNodeRef == null || nodeRef == null) { return null; }
-
+        
         int idx = inNodeRef.getStoreRef().getIdentifier().lastIndexOf(SEPARATOR);
         if (idx != -1)
         {   
             String tenantDomain = inNodeRef.getStoreRef().getIdentifier().substring(1, idx);
             return new NodeRef(nodeRef.getStoreRef().getProtocol(), getName(nodeRef.getStoreRef().getIdentifier(), tenantDomain), nodeRef.getId());            
         }
-
-        return nodeRef;       
-    }    
+        
+        return nodeRef;
+    }
     
     /* (non-Javadoc)
      * @see org.alfresco.repo.tenant.TenantService#getName(org.alfresco.service.cmr.repository.StoreRef)
@@ -131,16 +131,19 @@ public class MultiTServiceImpl implements TenantService
                 return new StoreRef(storeRef.getProtocol(), getName(storeRef.getIdentifier(), tenantDomain));
             }
         }
-
+        
         return storeRef;
     }
-  
+    
     protected String getName(String name, String tenantDomain)
     {
-        // Check that all the passed values are not null
-        ParameterCheck.mandatory("name", name);
         ParameterCheck.mandatory("tenantDomain", tenantDomain);
-                
+        
+        if (name == null)
+        {
+            return null;
+        }
+        
         checkTenantEnabled(tenantDomain);
         
         int idx1 = name.indexOf(SEPARATOR);
@@ -157,9 +160,9 @@ public class MultiTServiceImpl implements TenantService
             {
                 throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
             }
-        }               
-
-        return name;          
+        }
+        
+        return name;
     }
     
     /* (non-Javadoc)
@@ -167,9 +170,6 @@ public class MultiTServiceImpl implements TenantService
      */
     public QName getName(QName name)
     {
-        // Check that all the passed values are not null
-        ParameterCheck.mandatory("Name", name);
-
         String tenantDomain = getCurrentUserDomain();
         
         if (! tenantDomain.equals(DEFAULT_DOMAIN))
@@ -186,10 +186,8 @@ public class MultiTServiceImpl implements TenantService
      */
     public QName getName(NodeRef inNodeRef, QName name)
     {
-        // Check that all the passed values are not null
         ParameterCheck.mandatory("InNodeRef", inNodeRef);
-        ParameterCheck.mandatory("Name", name);
-
+        
         int idx = inNodeRef.getStoreRef().getIdentifier().lastIndexOf(SEPARATOR);
         if (idx != -1)
         {
@@ -197,13 +195,17 @@ public class MultiTServiceImpl implements TenantService
             checkTenantEnabled(tenantDomain);
             return getName(name, tenantDomain);
         }
-
-        return name;       
         
+        return name;
     }
-
+    
     private QName getName(QName name, String tenantDomain)
-    {            
+    {
+        if (name == null)
+        {
+            return null;
+        }
+        
         String namespace = name.getNamespaceURI();
         int idx1 = namespace.indexOf(SEPARATOR);
         if (idx1 == -1)
@@ -221,8 +223,8 @@ public class MultiTServiceImpl implements TenantService
                 throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
             }
         }
-
-        return name;  
+        
+        return name;
     }
 
     /* (non-Javadoc)
@@ -230,8 +232,10 @@ public class MultiTServiceImpl implements TenantService
      */
     public String getName(String name)
     {
-        // Check that all the passed values are not null
-        ParameterCheck.mandatory("name", name);
+        if (name == null)
+        {
+            return null;
+        }
         
         String tenantDomain = getCurrentUserDomain();
         
@@ -251,12 +255,12 @@ public class MultiTServiceImpl implements TenantService
                 {
                     throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
                 }
-            }               
+            }
         }
-
-        return name;          
+        
+        return name;
     }
-
+    
     /* (non-Javadoc)
      * @see org.alfresco.repo.tenant.TenantService#getBaseName(org.alfresco.service.namespace.QName, boolean)
      */
@@ -343,12 +347,14 @@ public class MultiTServiceImpl implements TenantService
      * @see org.alfresco.repo.tenant.TenantService#getBaseName(java.lang.String, boolean)
      */
     public String getBaseName(String name, boolean forceForNonTenant)
-    {   
-        // Check that all the passed values are not null
-        ParameterCheck.mandatory("name", name);
-
+    {
+        if (name == null)
+        {
+            return null;
+        }
+        
         String tenantDomain = getCurrentUserDomain();
-               
+        
         int idx1 = name.indexOf(SEPARATOR);
         if (idx1 == 0)
         {
@@ -365,8 +371,8 @@ public class MultiTServiceImpl implements TenantService
                 // remove tenant domain
                 name = name.substring(idx2+1);
             }
-        } 
-
+        }
+        
         return name;
     }
     
@@ -391,14 +397,13 @@ public class MultiTServiceImpl implements TenantService
      * @see org.alfresco.repo.tenant.TenantService#checkDomainUser(java.lang.String)
      */
     public void checkDomainUser(String username)
-    {   
-        // Check that all the passed values are not null        
+    {
         ParameterCheck.mandatory("Username", username);
         
         String tenantDomain = getCurrentUserDomain();
-          
-         if (! tenantDomain.equals(DEFAULT_DOMAIN))
-         {
+        
+        if (! tenantDomain.equals(DEFAULT_DOMAIN))
+        {
             int idx2 = username.lastIndexOf(SEPARATOR);
             if ((idx2 > 0) && (idx2 < (username.length()-1)))
             {
@@ -406,12 +411,12 @@ public class MultiTServiceImpl implements TenantService
                 
                 if ((tenantUserDomain == null) || (! tenantDomain.equals(tenantUserDomain)))
                 {
-                    throw new TenantDomainMismatchException(tenantDomain, tenantUserDomain); 
+                    throw new TenantDomainMismatchException(tenantDomain, tenantUserDomain);
                 }
             }
             else
             {
-                throw new TenantDomainMismatchException(tenantDomain, null); 
+                throw new TenantDomainMismatchException(tenantDomain, null);
             }
         }
     }
@@ -420,10 +425,12 @@ public class MultiTServiceImpl implements TenantService
      * @see org.alfresco.repo.tenant.TenantService#checkDomain(java.lang.String)
      */
     public void checkDomain(String name)
-    {       
-        // Check that all the passed values are not null        
-        ParameterCheck.mandatory("Name", name);
-          
+    {
+        if (name == null)
+        {
+            return;
+        }
+        
         String nameDomain = null;
         
         int idx1 = name.indexOf(SEPARATOR);
@@ -432,7 +439,7 @@ public class MultiTServiceImpl implements TenantService
             int idx2 = name.indexOf(SEPARATOR, 1);
             nameDomain = name.substring(1, idx2);
         }
-                
+        
         String tenantDomain = getCurrentUserDomain();
         
         if (((nameDomain == null) && (! tenantDomain.equals(DEFAULT_DOMAIN))) || 
@@ -447,19 +454,18 @@ public class MultiTServiceImpl implements TenantService
      */
     public NodeRef getRootNode(NodeService nodeService, SearchService searchService, NamespaceService namespaceService, String rootPath, NodeRef rootNodeRef)
     {
-        // Check that all the passed values are not null
         ParameterCheck.mandatory("NodeService", nodeService);
         ParameterCheck.mandatory("SearchService", searchService);  
         ParameterCheck.mandatory("NamespaceService", namespaceService);
         ParameterCheck.mandatory("RootPath", rootPath);  
         ParameterCheck.mandatory("RootNodeRef", rootNodeRef); 
-
+        
         String username = AuthenticationUtil.getFullyAuthenticatedUser();
         StoreRef storeRef = getName(username, rootNodeRef.getStoreRef());
         
         AuthenticationUtil.RunAsWork<NodeRef> action = new GetRootNode(nodeService, searchService, namespaceService, rootPath, rootNodeRef, storeRef);
         return getBaseName(AuthenticationUtil.runAs(action, AuthenticationUtil.getSystemUserName()));
-    }         
+    }
     
     private class GetRootNode implements AuthenticationUtil.RunAsWork<NodeRef>
     {
@@ -546,15 +552,28 @@ public class MultiTServiceImpl implements TenantService
      */
     public boolean isTenantName(String name)
     {
-        return (! TenantService.DEFAULT_DOMAIN.equals(getDomain(name, false)));
+        ParameterCheck.mandatory("name", name);
+        
+        int idx1 = name.indexOf(SEPARATOR);
+        if (idx1 == 0)
+        {
+            int idx2 = name.indexOf(SEPARATOR, 1);
+            if (idx2 != -1)
+            {
+                return true;
+            }
+        }
+        
+        return false;
     }
     
     /* (non-Javadoc)
      * @see org.alfresco.repo.tenant.TenantService#getUserDomain(java.lang.String)
      */
+    // TODO review usages (re: cloud external user => more than one domain)
     public String getUserDomain(String username)
     {
-    	// can be null (e.g. for System user / during app ctx init)
+        // can be null (e.g. for System user / during app ctx init)
         if (username != null) 
         {
             int idx = username.lastIndexOf(SEPARATOR);
@@ -575,8 +594,12 @@ public class MultiTServiceImpl implements TenantService
      */
     public String getCurrentUserDomain()
     {
-    	String user = AuthenticationUtil.getRunAsUser();
-        return getUserDomain(user);
+        String tenantDomain = TenantUtil.getCurrentDomain();
+        if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
+        {
+            checkTenantEnabled(tenantDomain);
+        }
+        return tenantDomain;
     }
     
     /* (non-Javadoc)
@@ -597,6 +620,7 @@ public class MultiTServiceImpl implements TenantService
         if (idx1 == 0)
         {
             int idx2 = name.indexOf(SEPARATOR, 1);
+            
             nameDomain = getTenantDomain(name.substring(1, idx2));
             
             if (checkCurrentDomain)
@@ -608,7 +632,7 @@ public class MultiTServiceImpl implements TenantService
                     throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
                 }
             }
-        } 
+        }
         
         return nameDomain;
     }
@@ -635,12 +659,11 @@ public class MultiTServiceImpl implements TenantService
      */
     public String getDomainUser(String baseUsername, String tenantDomain)
     {
-        // Check that all the passed values are not null
         ParameterCheck.mandatory("baseUsername", baseUsername);
         
         if ((tenantDomain == null) || (tenantDomain.equals(DEFAULT_DOMAIN)))
         {
-        	return baseUsername;
+            return baseUsername;
         }
         else
         {
@@ -653,7 +676,7 @@ public class MultiTServiceImpl implements TenantService
             {
                 throw new AlfrescoRuntimeException("Invalid tenant domain: " + tenantDomain);
             }
-        
+            
             tenantDomain = getTenantDomain(tenantDomain);
             return baseUsername + SEPARATOR + tenantDomain;
         }
diff --git a/source/java/org/alfresco/repo/tenant/TenantRoutingContentStore.java b/source/java/org/alfresco/repo/tenant/TenantRoutingContentStore.java
new file mode 100644
index 0000000000..62c3224c4c
--- /dev/null
+++ b/source/java/org/alfresco/repo/tenant/TenantRoutingContentStore.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.tenant;
+
+
+/**
+ * Content Store that supports tenant routing, if multi-tenancy is enabled.
+ */
+public interface TenantRoutingContentStore extends TenantDeployer
+{
+    public String getDefaultRootDir();
+}
diff --git a/source/java/org/alfresco/repo/tenant/TenantRoutingFileContentStore.java b/source/java/org/alfresco/repo/tenant/TenantRoutingFileContentStore.java
new file mode 100644
index 0000000000..c153856977
--- /dev/null
+++ b/source/java/org/alfresco/repo/tenant/TenantRoutingFileContentStore.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.tenant;
+
+import java.io.File;
+
+import org.alfresco.repo.content.ContentStore;
+import org.alfresco.repo.content.filestore.FileContentStore;
+import org.springframework.context.ApplicationContext;
+
+
+
+/**
+ * MT-aware File Content Store
+ */
+public class TenantRoutingFileContentStore extends AbstractTenantRoutingContentStore
+{
+    protected ContentStore initContentStore(ApplicationContext ctx, String contentRoot)
+    {
+        return new FileContentStore(ctx, new File(contentRoot));
+    }
+}
diff --git a/source/java/org/alfresco/repo/tenant/TenantUtil.java b/source/java/org/alfresco/repo/tenant/TenantUtil.java
new file mode 100644
index 0000000000..0df572dea6
--- /dev/null
+++ b/source/java/org/alfresco/repo/tenant/TenantUtil.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.tenant;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+
+/**
+ * Utility helper methods to change the tenant context for threads.
+ *
+ * @since Thor
+ */
+public class TenantUtil
+{
+    public interface TenantRunAsWork<Result>
+    {
+        /**
+         * Method containing the work to be done
+         * 
+         * @return Return the result of the operation
+         */
+        Result doWork() throws Exception;
+    }
+
+    /**
+     * Execute a unit of work in a given tenant context. The thread's tenant context will be returned to its normal state
+     * after the call.
+     * 
+     * @param runAsWork  the unit of work to do
+     * @param uid        the user ID
+     * @return Returns the work's return value
+     */
+    public static <R> R runAsPrimaryTenant(final TenantRunAsWork<R> runAsWork, String user)
+    {
+        // TODO need to differentiate between
+        // - tenant user - with implied context (in MT Ent world)
+        // - system users as a tenant
+        // - super tenant only
+        // etc
+
+        // TODO for now, this is just a brute force change of tenant regardless of above
+        //      scenarios
+        String runAsUser = AuthenticationUtil.getRunAsUser();
+        if (runAsUser == null || runAsUser.equals(user))
+        {
+            return runAsWork(runAsWork);
+        }
+        else
+        {
+            return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<R>()
+            {
+                public R doWork()
+                {
+                    return runAsWork(runAsWork);
+                }
+            }, user);
+        }
+    }
+    
+    /**
+     * Execute a unit of work in a given tenant context. The thread's tenant context will be returned to its normal state
+     * after the call.
+     * 
+     * @param runAsWork  the unit of work to do
+     * @param uid        the user ID
+     * @return Returns the work's return value
+     */
+    public static <R> R runAsTenant(final TenantRunAsWork<R> runAsWork, String tenantDomain)
+    {
+        // TODO need to differentiate between
+        // - tenant user - with implied context (in MT Ent world)
+        // - system users as a tenant
+        // - super tenant only
+        // etc
+
+        // TODO for now, this is just a brute force change of tenant regardless of above
+        //      scenarios
+        
+        if (getCurrentDomain().equals(tenantDomain))
+        {
+            return runAsWork(runAsWork);
+        }
+        else
+        {
+            return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<R>()
+            {
+                public R doWork()
+                {
+                    return runAsWork(runAsWork);
+                }
+            }, AuthenticationUtil.getRunAsUser() + TenantService.SEPARATOR + tenantDomain);
+        }
+    }
+
+    public static <R> R runAsDefaultTenant(final TenantRunAsWork<R> runAsWork)
+    {
+        // Note: with MT Enterprise, if you're current user is not already part of the default domain then this will switch to System
+        if (getCurrentDomain().equals(TenantService.DEFAULT_DOMAIN))
+        {
+            return runAsWork(runAsWork);
+        }
+        else
+        {
+            return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<R>()
+            {
+                public R doWork()
+                {
+                    return runAsWork(runAsWork);
+                }
+            }, AuthenticationUtil.getSystemUserName() + TenantService.SEPARATOR); // force default domain;
+        }
+    }
+    
+    // switch tenant and run as System within that tenant
+    public static <R> R runAsSystemTenant(final TenantRunAsWork<R> runAsWork, final String tenantDomain)
+    {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<R>()
+        {
+            public R doWork()
+            {
+                return runAsWork(runAsWork);
+            }
+        }, AuthenticationUtil.getSystemUserName() + TenantService.SEPARATOR + tenantDomain);
+    }
+    
+    private static <R> R runAsWork(final TenantRunAsWork<R> runAsWork)
+    {
+        try
+        {
+            return runAsWork.doWork();
+        }
+        catch (Throwable exception)
+        {
+            // Re-throw the exception
+            if (exception instanceof RuntimeException)
+            {
+                throw (RuntimeException) exception;
+            }
+            throw new RuntimeException("Error during run as.", exception);
+        }
+    }
+    
+    // note: this does not check if tenant is enabled (unlike non-static MultiTServiceImpl.getCurrentUserDomain)
+    public static String getCurrentDomain()
+    {
+        if (AuthenticationUtil.isMtEnabled())
+        {
+            String runAsUser = AuthenticationUtil.getRunAsUser();
+            if (runAsUser != null)
+            {
+                int idx = runAsUser.lastIndexOf(TenantService.SEPARATOR);
+                if ((idx > 0) && (idx < (runAsUser.length()-1)))
+                {
+                    return runAsUser.substring(idx+1);
+                }
+            }
+        }
+        return TenantService.DEFAULT_DOMAIN;
+    }
+}
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java b/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
index 82bd6f2e16..abb65abd6e 100644
--- a/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
+++ b/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Alfresco Software Limited.
+ * Copyright (C) 2009-2011 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -40,6 +40,7 @@ import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.content.ContentServicePolicies;
 import org.alfresco.repo.copy.CopyBehaviourCallback;
 import org.alfresco.repo.copy.CopyDetails;
@@ -191,17 +192,12 @@ public class RepoTransferReceiverImpl implements TransferReceiver,
     private AlienProcessor alienProcessor;
     private JobLockService jobLockService;
     private TransferVersionChecker transferVersionChecker;
-
-    /**
-     * Where the temporary files are stored.    Tenant Domain Name, NodeRef
-     */
-    private Map<String,NodeRef> transferTempFolderMap = new ConcurrentHashMap<String, NodeRef>();
-
-    /**
-     * Where the destination side transfer report is generated.    Tenant Domain Name, NodeRef
-     */
-    private Map<String,NodeRef> inboundTransferRecordsFolderMap = new ConcurrentHashMap<String, NodeRef>();
-
+    
+    // note: cache is tenant-aware (if using EhCacheAdapter shared cache)
+    private SimpleCache<String, NodeRef> singletonCache; // eg. for transfer temp folder nodeRef
+    private final String KEY_TRANSFER_TEMP_NODEREF = "key.transferTempFolder.noderef"; // where temp files are stored
+    private final String KEY_INBOUND_TRANSFER_RECORDS_NODEREF = "key.inboundTransferRecordsFolder.noderef"; // where the destination side transfer report is generated
+    
     private ClassPolicyDelegate<BeforeStartInboundTransferPolicy> beforeStartInboundTransferDelegate;
     private ClassPolicyDelegate<OnStartInboundTransferPolicy> onStartInboundTransferDelegate;
     private ClassPolicyDelegate<OnEndInboundTransferPolicy> onEndInboundTransferDelegate;
@@ -352,8 +348,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver,
 
     public NodeRef getTempFolder(String transferId)
     {
-        String tenantDomain = tenantService.getUserDomain(AuthenticationUtil.getRunAsUser());
-        NodeRef transferTempFolder = transferTempFolderMap.get(tenantDomain);
+        NodeRef transferTempFolder = singletonCache.get(KEY_TRANSFER_TEMP_NODEREF);
 
         // Have we already resolved the node that is the temp folder?
         // If not then do so.
@@ -364,7 +359,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver,
             if (rs.length() > 0)
             {
                 transferTempFolder = rs.getNodeRef(0);
-                transferTempFolderMap.put(tenantDomain, transferTempFolder);
+                singletonCache.put(KEY_TRANSFER_TEMP_NODEREF, transferTempFolder);
             }
             else
             {
@@ -500,8 +495,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver,
     private NodeRef createTransferRecord()
     {
         log.debug("Receiver createTransferRecord");
-        String tenantDomain = tenantService.getUserDomain(AuthenticationUtil.getRunAsUser());
-        NodeRef inboundTransferRecordsFolder = inboundTransferRecordsFolderMap.get(tenantDomain);
+        NodeRef inboundTransferRecordsFolder = singletonCache.get(KEY_INBOUND_TRANSFER_RECORDS_NODEREF);
 
         if (inboundTransferRecordsFolder == null)
         {
@@ -511,7 +505,7 @@ public class RepoTransferReceiverImpl implements TransferReceiver,
             if (rs.length() > 0)
             {
                 inboundTransferRecordsFolder = rs.getNodeRef(0);
-                inboundTransferRecordsFolderMap.put(tenantDomain, inboundTransferRecordsFolder);
+                singletonCache.put(KEY_INBOUND_TRANSFER_RECORDS_NODEREF, inboundTransferRecordsFolder);
                 log.debug("Found inbound transfer records folder: " + inboundTransferRecordsFolder);
             }
             else
@@ -1013,7 +1007,12 @@ public class RepoTransferReceiverImpl implements TransferReceiver,
     {
         this.tenantService = tenantService;
     }
-
+    
+    public void setSingletonCache(SimpleCache<String, NodeRef> singletonCache)
+    {
+        this.singletonCache = singletonCache;
+    }
+    
     /**
      * @param transferLockFolderPath
      *            the transferLockFolderPath to set
diff --git a/source/java/org/alfresco/repo/transfer/TransferServiceImpl2.java b/source/java/org/alfresco/repo/transfer/TransferServiceImpl2.java
index fbc4f78ffc..913be010db 100644
--- a/source/java/org/alfresco/repo/transfer/TransferServiceImpl2.java
+++ b/source/java/org/alfresco/repo/transfer/TransferServiceImpl2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Alfresco Software Limited.
+ * Copyright (C) 2009-2011 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -40,7 +40,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
 
 import javax.transaction.UserTransaction;
 import javax.xml.parsers.ParserConfigurationException;
@@ -49,8 +48,7 @@ import javax.xml.parsers.SAXParserFactory;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.repo.transfer.manifest.TransferManifestDeletedNode;
 import org.alfresco.repo.transfer.manifest.TransferManifestHeader;
@@ -162,7 +160,6 @@ public class TransferServiceImpl2 implements TransferService2
     private ActionService actionService;
     private TransferManifestNodeFactory transferManifestNodeFactory;
     private TransferReporter transferReporter;
-    private TenantService tenantService;
     private DescriptorService descriptorService;
     private TransferVersionChecker transferVersionChecker;
     private NamespaceService namespaceService;
@@ -573,8 +570,6 @@ public class TransferServiceImpl2 implements TransferService2
         // Wire in the transferReport - so any callbacks are stored in transferReport
         TransferCallback reportCallback = new TransferCallback()
         {
-            private static final long serialVersionUID = 4072579605731036522L;
-
             public void processEvent(TransferEvent event)
             {
                 transferReportEvents.add(event);
@@ -1160,9 +1155,9 @@ public class TransferServiceImpl2 implements TransferService2
         this.searchService = searchService;
     }
 
-    public void setTenantService(TenantService tenantService)
+    public void setSingletonCache(SimpleCache<String, NodeRef> singletonCache)
     {
-        this.tenantService = tenantService;
+        this.singletonCache = singletonCache;
     }
 
     public void setTransferSpaceQuery(String transferSpaceQuery)
@@ -1184,34 +1179,31 @@ public class TransferServiceImpl2 implements TransferService2
     {
         this.transmitter = transmitter;
     }
-
-    private Map<String,NodeRef> transferHomeMap = new ConcurrentHashMap<String, NodeRef>();
+    
+    // note: cache is tenant-aware (if using EhCacheAdapter shared cache)
+    
+    private SimpleCache<String, NodeRef> singletonCache; // eg. for transferHomeNodeRef
+    private final String KEY_TRANSFER_HOME_NODEREF = "key.transferServiceImpl2Home.noderef";
+    
     protected NodeRef getTransferHome()
     {
-        String tenantDomain = tenantService.getUserDomain(AuthenticationUtil.getRunAsUser());
-
-        synchronized (transferHomeMap)
+        NodeRef transferHome = singletonCache.get(KEY_TRANSFER_HOME_NODEREF);
+        if(transferHome == null)
         {
-            NodeRef transferHome = transferHomeMap.get(tenantDomain);
-            if(transferHome == null)
+            String query = transferSpaceQuery;
+            List<NodeRef> refs = searchService.selectNodes(nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), query, null, namespaceService, false);
+            if (refs.size() == 0)
             {
-                String query = transferSpaceQuery;
-
-                List<NodeRef> refs = searchService.selectNodes(nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), query, null, namespaceService, false);
-
-                if (refs.size() == 0)
-                {
-                    // No transfer home.
-                    throw new TransferException(MSG_NO_HOME, new Object[] { query });
-                }
-                if (refs.size() != 0)
-                {
-                    transferHome = refs.get(0);
-                    transferHomeMap.put(tenantDomain, transferHome);
-                }
+                // No transfer home.
+                throw new TransferException(MSG_NO_HOME, new Object[] { query });
+            }
+            if (refs.size() != 0)
+            {
+                transferHome = refs.get(0);
+                singletonCache.put(KEY_TRANSFER_HOME_NODEREF, transferHome);
             }
-            return transferHome;
         }
+        return transferHome;
     }
     
     private char[] encrypt(char[] text)
diff --git a/source/java/org/alfresco/repo/transfer/script/ScriptTransferService.java b/source/java/org/alfresco/repo/transfer/script/ScriptTransferService.java
index 72da76b6d8..92bfcbe0d4 100644
--- a/source/java/org/alfresco/repo/transfer/script/ScriptTransferService.java
+++ b/source/java/org/alfresco/repo/transfer/script/ScriptTransferService.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.transfer.script;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 
 import org.alfresco.repo.jscript.BaseScopableProcessorExtension;
@@ -30,6 +31,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.transfer.TransferDefinition;
 import org.alfresco.service.cmr.transfer.TransferService;
 import org.alfresco.service.cmr.transfer.TransferTarget;
+import org.alfresco.service.namespace.QName;
 
 /**
  * Java Script Transfer Service.   Adapts the Java Transfer Service to
@@ -44,6 +46,9 @@ public class ScriptTransferService extends BaseScopableProcessorExtension
     private ServiceRegistry serviceRegistry;
     
     ValueConverter valueConverter = new ValueConverter();
+    
+    // Which aspects to exclude
+    private List<QName> excludedAspects = new ArrayList<QName>();
 
     /**
      * @param transferService
@@ -111,17 +116,23 @@ public class ScriptTransferService extends BaseScopableProcessorExtension
     }
     
     /**
-     * Transfer a set of nodes, with no callback
+     * Transfer a set of nodes, with no callback.
+     * <p>
+     * Nodes are to be locked read only on target.
+     * 
      * @param targetName the name of the target to transfer to
      * @param nodes the nodes to transfer - Java Script Array of either ScriptNodes, NodeRef or String 
      * @return node ref of transfer report.  
      */
     @SuppressWarnings("unchecked")
-    public ScriptNode transfer(String targetName, Object nodesToTransfer)
+    public ScriptNode transferReadOnly(String targetName, Object nodesToTransfer)
     {
         Object nodesObject = valueConverter.convertValueForJava(nodesToTransfer);
         
         TransferDefinition toTransfer = new TransferDefinition();
+        toTransfer.setReadOnly(true);
+        toTransfer.setExcludedAspects(excludedAspects);
+        
         Collection<NodeRef> nodeCollection = new ArrayList<NodeRef>();
         
         if(nodesObject instanceof Collection)
@@ -161,6 +172,118 @@ public class ScriptTransferService extends BaseScopableProcessorExtension
         
         return new ScriptNode(reportNode, serviceRegistry, getScope());
     }
+    /**
+     * Transfer a set of nodes, with no callback
+     * <p>
+     * Nodes are not locked on the target.
+     * 
+     * @param targetName the name of the target to transfer to
+     * @param nodes the nodes to transfer - Java Script Array of either ScriptNodes, NodeRef or String 
+     * @return node ref of transfer report.  
+     */
+    @SuppressWarnings("unchecked")
+    public ScriptNode transfer(String targetName, Object nodesToTransfer)
+    {
+        Object nodesObject = valueConverter.convertValueForJava(nodesToTransfer);
+        
+        TransferDefinition toTransfer = new TransferDefinition();
+        toTransfer.setExcludedAspects(excludedAspects);
+        Collection<NodeRef> nodeCollection = new ArrayList<NodeRef>();
+        
+        if(nodesObject instanceof Collection)
+        {
+            for(Object value : (Collection)nodesObject)
+            {
+                if(value instanceof NodeRef)
+                {
+                    nodeCollection.add((NodeRef)value);
+                }
+                else if (value instanceof String)
+                {
+                    nodeCollection.add(new NodeRef((String)value));
+                }
+                else
+                {        
+                    throw new IllegalArgumentException("transfer: unknown type in collection: " + value.getClass().getName());
+                } 
+            }
+           
+        }
+        else if(nodesObject instanceof NodeRef)
+        {
+            nodeCollection.add((NodeRef)nodesObject);
+        }
+        else if (nodesObject instanceof String)
+        {
+            nodeCollection.add(new NodeRef((String)nodesObject));
+        }
+        else
+        {   
+            throw new IllegalArgumentException("transfer: unexpected type for nodes :" + nodesObject.getClass().getName());
+        }
+        
+        toTransfer.setNodes(nodeCollection);
+        NodeRef reportNode = transferService.transfer(targetName, toTransfer);
+        
+        return new ScriptNode(reportNode, serviceRegistry, getScope());
+    }
+    
+    /**
+     * Remove a set of nodes, with no callback
+     * <p>
+     * Nodes are not locked on the target.
+     * 
+     * @param targetName the name of the target to transfer to
+     * @param nodes the nodes to transfer - Java Script Array of either ScriptNodes, NodeRef or String 
+     * @return node ref of transfer report.  
+     */
+    @SuppressWarnings("unchecked")
+    public ScriptNode remove(String targetName, Object nodesToRemove)
+    {
+        Object nodesObject = valueConverter.convertValueForJava(nodesToRemove);
+        
+        TransferDefinition toTransfer = new TransferDefinition();
+        toTransfer.setExcludedAspects(excludedAspects);
+        Collection<NodeRef> nodeCollection = new ArrayList<NodeRef>();
+        
+        if(nodesObject instanceof Collection)
+        {
+            for(Object value : (Collection)nodesObject)
+            {
+                if(value instanceof NodeRef)
+                {
+                    nodeCollection.add((NodeRef)value);
+                }
+                else if (value instanceof String)
+                {
+                    nodeCollection.add(new NodeRef((String)value));
+                }
+                else
+                {        
+                    throw new IllegalArgumentException("transfer: unknown type in collection: " + value.getClass().getName());
+                } 
+            }
+           
+        }
+        else if(nodesObject instanceof NodeRef)
+        {
+            nodeCollection.add((NodeRef)nodesObject);
+        }
+        else if (nodesObject instanceof String)
+        {
+            nodeCollection.add(new NodeRef((String)nodesObject));
+        }
+        else
+        {   
+            throw new IllegalArgumentException("transfer: unexpected type for nodes :" + nodesObject.getClass().getName());
+        }
+        
+        toTransfer.setNodesToRemove(nodeCollection);
+        NodeRef reportNode = transferService.transfer(targetName, toTransfer);
+        
+        return new ScriptNode(reportNode, serviceRegistry, getScope());
+    }
+
 
     public void setServiceRegistry(ServiceRegistry serviceRegistry)
     {
@@ -171,4 +294,12 @@ public class ScriptTransferService extends BaseScopableProcessorExtension
     {
         return serviceRegistry;
     }
+
+    public void setExcludedAspects(String[] excludedAspects)
+    {
+        for (String aspect : excludedAspects)
+        {
+            this.excludedAspects.add(QName.createQName(aspect));
+        }
+    }
 }
diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
index 2a88bd016f..3b183129d6 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
@@ -326,6 +326,12 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
          try 
          {
              String resourceName = GUID.generate() + BpmnDeployer.BPMN_RESOURCE_SUFFIX;
+             
+             if(tenantService.isEnabled())
+             {
+                 name = tenantService.getName(name);
+             }
+             
              Deployment deployment = repoService.createDeployment()
                  .addInputStream(resourceName, workflowDefinition)
                  .name(name)
diff --git a/source/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsMap.java b/source/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsMap.java
new file mode 100644
index 0000000000..876537a730
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsMap.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.service.cmr.repository;
+
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Helper class to create an immutable
+ * {@code Map<String, Map<String, TransformationOptionLimits>>}, keyed on source and target mimetypes. Used to
+ * define transformation limits, without having to specify lots of spring XML. For example:
+ * 
+ * <pre>
+ * &ltbean id="mimetypeLimits.OpenOffice" class="org.alfresco.service.cmr.repository.TransformationOptionLimitsMap"&gt;
+ *    &ltconstructor-arg&gt;
+ *       &ltvalue&gt;
+ *          *   txt TransformationOptionLimits ${content.transformer.OpenOffice.mimeTypeLimits.txt.pdf.maxSourceSizeKBytes} ;
+ *          doc pdf maxSourceSizeKBytes ${content.transformer.OpenOffice.mimeTypeLimits.doc.pdf.maxSourceSizeKBytes}
+ *       &lt/value&gt;
+ *    &lt/constructor-arg&gt;
+ *    &ltconstructor-arg&gt;
+ *       &ltref bean="mimetypeService" /&gt;
+ *    &lt/constructor-arg&gt;
+ * &lt/bean&gt;
+ * <pre>
+ * The first constructor argument is a space separated list of values:
+ * <pre>
+ * configuration ::= [ &ltsource extension&gt; &lttarget extension&gt; &ltproperty name&gt; &lt;value&gt; ]* ";" ]*
+ * property name ::= "maxSourceSizeKBytes" | "readLimitKBytes" | "readLimitTimeMs" | "timeoutMs" | "maxPages" | "pageLimit"
+ * </pre>
+ * 
+ * @author Alan Davis
+ */
+public class TransformationOptionLimitsMap extends
+        AbstractMap<String, Map<String, TransformationOptionLimits>>
+{
+    private static final Log logger = LogFactory.getLog(TransformationOptionLimitsMap.class);
+
+    private Map<String, Map<String, TransformationOptionLimits>> map = new HashMap<String, Map<String, TransformationOptionLimits>>();
+
+    private enum State
+    {
+        SOURCE, TARGET, NAME, VALUE
+    }
+
+    private List<String> propertyNames = Arrays.asList("maxsourcesizekbytes", "readlimitkbytes",
+            "readlimittimems", "timeoutms", "maxpages", "pagelimit");
+
+    /**
+     * Constructor. The {@code value} parameter takes a space separated list of
+     * values that define the map. See the class descriptor.
+     * 
+     * @param values
+     *            the configuration.
+     * @param mimetypeService
+     *            used to lookup mimetypes.
+     */
+    public TransformationOptionLimitsMap(String values, MimetypeService mimetypeService)
+    {
+        String sourceMimetype = null;
+        String targetMimetype = null;
+        TransformationOptionLimits limits = null;
+        String name = null;
+        long value;
+        int entry = 1;
+        State state = State.SOURCE;
+        
+        
+        String[] bits = values.split("  *");
+        mimetypeService.getMimetypesByExtension();
+        for (String bit: bits)
+        {
+            // ignore white space such as new lines
+            bit = bit.trim();
+            if (bit.length() == 0)
+            {
+                continue;
+            }            
+            
+            switch(state)
+            {
+            case SOURCE:
+                sourceMimetype = bit.equals("*") ? bit : mimetypeService.getMimetype(bit);
+                if (sourceMimetype == null)
+                {
+                    logger.error("Entry "+entry+" invalid source extension '"+bit+"' - ignored");
+                }
+                else
+                {
+                    state = State.TARGET;
+                }
+                break;
+            case TARGET:
+                targetMimetype = bit.equals("*") ? bit : mimetypeService.getMimetype(bit);
+                if (targetMimetype == null)
+                {
+                    logger.error("Entry "+entry+" invalid target extension '"+bit+"' - ignored");
+                }
+                else
+                {
+                    limits = new TransformationOptionLimits();
+                    state = State.NAME;
+                }
+                break;
+            case NAME:
+                if (";".equals(bit))
+                {
+                    add(sourceMimetype, targetMimetype, limits);
+                    entry++;
+                    state = State.SOURCE;
+                }
+                else
+                {
+                    if (propertyNames.contains(bit.toLowerCase()))
+                    {
+                        name = bit.toLowerCase();
+                        state = State.VALUE;
+                    }
+                    else
+                    {
+                        logger.error("Entry " + entry + " invalid property name '" + bit
+                                + "' - ignored");
+                    }
+                }
+                break;
+            case VALUE:
+                try
+                {
+                    value = Long.parseLong(bit);
+                    if (name.equalsIgnoreCase("maxSourceSizeKBytes"))
+                    {
+                        limits.setMaxSourceSizeKBytes(value);
+                    }
+                    else if (name.equalsIgnoreCase("readLimitKBytes"))
+                    {
+                        limits.setReadLimitKBytes(value);
+                    }
+                    else if (name.equalsIgnoreCase("readLimitTimeMs"))
+                    {
+                        limits.setReadLimitTimeMs(value);
+                    }
+                    else if (name.equalsIgnoreCase("timeoutMs"))
+                    {
+                        limits.setTimeoutMs(value);
+                    }
+                    else if (value > Integer.MAX_VALUE)
+                    {
+                        logger.error("Entry "+entry+" invalid property name '"+bit+"' - skipping property and value");
+                    }
+                    else if (name.equalsIgnoreCase("maxPages"))
+                    {
+                        limits.setMaxPages((int)value);
+                    }
+                    else if (name.equalsIgnoreCase("pageLimit"))
+                    {
+                        limits.setPageLimit((int)value);
+                    }
+                }
+                catch (NumberFormatException e)
+                {
+                    logger.error("Entry " + entry + " invalid value '" + bit + "' - skipping property and value");
+                }
+                state = State.NAME;
+                break;
+            }
+        }
+        // Optional last ;
+        if (state == State.NAME)
+        {
+            add(sourceMimetype, targetMimetype, limits);
+        }
+        else if (state != State.SOURCE)
+        {
+            logger.error("Entry " + entry + " is incomplete.");
+        }
+    }
+
+    private void add(String sourceMimetype, String targetMimetype, TransformationOptionLimits limits)
+    {
+        Map<String, TransformationOptionLimits> map2 = map.get(sourceMimetype);
+        if (map2 == null)
+        {
+            map2 = new HashMap<String, TransformationOptionLimits>();
+            map.put(sourceMimetype, map2);
+        }
+        map2.put(targetMimetype, limits);
+    }
+
+    @Override
+    public Set<Map.Entry<String, Map<String, TransformationOptionLimits>>> entrySet()
+    {
+        return map.entrySet();
+    }
+}
diff --git a/source/java/org/alfresco/service/cmr/transfer/TransferDefinition.java b/source/java/org/alfresco/service/cmr/transfer/TransferDefinition.java
index dc43236b28..e9fa6da915 100644
--- a/source/java/org/alfresco/service/cmr/transfer/TransferDefinition.java
+++ b/source/java/org/alfresco/service/cmr/transfer/TransferDefinition.java
@@ -123,11 +123,11 @@ public class TransferDefinition implements Serializable
     /**
      * Sets which aspects to exclude from transfer
      * 
-     * @param exludedAspects collection of aspects to exclude
+     * @param excludedAspects collection of aspects to exclude
      */
-    public void setExcludedAspects(Collection<QName> exludedAspects)
+    public void setExcludedAspects(Collection<QName> excludedAspects)
     {
-        this.excludedAspects = new HashSet<QName>(exludedAspects);
+        this.excludedAspects = new HashSet<QName>(excludedAspects);
     }
 
     /**
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java
index e30e01d814..acc074606c 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -385,7 +385,7 @@ public interface WorkflowService
      * @return image view of the workflow instance as an InputStream or null if a diagram is not available
      * @since 4.0
      */
-    @Auditable(parameters = {"workflowInstanceId"})
+    @Auditable(parameters = {"workflowInstanceId"}, recordReturnedObject=false)
     public InputStream getWorkflowImage(String workflowInstanceId);
     
     //
diff --git a/source/java/org/alfresco/util/XMLUtil.java b/source/java/org/alfresco/util/XMLUtil.java
index 7738c8b166..664d1ae3bc 100644
--- a/source/java/org/alfresco/util/XMLUtil.java
+++ b/source/java/org/alfresco/util/XMLUtil.java
@@ -19,7 +19,6 @@
 
 package org.alfresco.util;
 
-import java.io.ByteArrayInputStream;
 import java.io.CharArrayReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -50,6 +49,7 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Attr;
@@ -499,8 +499,13 @@ public class XMLUtil
 
 		   {
 			   add("xalan://");
+			   add("http://exslt.org/");
+			   add("http://xml.apache.org/xalan/PipeDocument");
+			   add("http://xml.apache.org/xalan/sql");
+			   add("http://xml.apache.org/xalan/redirect");
+			   add("http://xml.apache.org/xalan/xsltc/java");
 			   add("http://xml.apache.org/xalan/java");
-			   add("http://xml.apache.org/xslt/java");
+			   add("http://xml.apache.org/xslt");
 			   add("http://xml.apache.org/java");
 		   }
 	   };
@@ -538,7 +543,7 @@ public class XMLUtil
 	   {
 		   for (String insecureURI : insecureURIs) 
 		   {
-			   if (uri.startsWith(insecureURI)) return true;
+			   if (StringUtils.startsWithIgnoreCase(uri, insecureURI)) return true;
 		   }
 		   return false;
 	   }
diff --git a/source/test-resources/tenant/mt-contentstore-context.xml b/source/test-resources/tenant/mt-contentstore-context.xml
index ff961edc34..eee37fd75e 100644
--- a/source/test-resources/tenant/mt-contentstore-context.xml
+++ b/source/test-resources/tenant/mt-contentstore-context.xml
@@ -3,60 +3,12 @@
 
 <beans>
 
-   <!-- ======================================= -->
-   <!-- Tenant Routing File Content Store Cache -->
-   <!-- ======================================= -->
+   <!--                                      -->
+   <!-- (Tenant Routing) File Content Store  -->
+   <!--                                      -->
    
-   <bean name="tenantFileStoresCache" class="org.alfresco.repo.cache.EhCacheAdapter">
-      <property name="cache">
-         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
-            <property name="cacheManager">
-               <ref bean="internalEHCacheManager" />
-            </property>
-            <property name="cacheName">
-               <value>org.alfresco.cache.tenantFileStoresCache</value>
-            </property>
-         </bean>
-      </property>
+   <bean id="fileContentStore" class="org.alfresco.repo.tenant.TenantRoutingFileContentStore" parent="baseTenantRoutingContentStore">
+      <property name="defaultRootDir" value="${dir.contentstore}" />
    </bean>
    
-   <!--                                   -->
-   <!-- Tenant Routing File Content Store -->
-   <!--                                   -->
-   
-   <bean id="tenantFileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore">
-      <property name="defaultRootDir">
-         <value>${dir.contentstore}</value>
-      </property>
-      <property name="tenantService">
-         <ref bean="tenantService" />
-      </property>
-      <property name="storesCache">
-         <ref bean="tenantFileStoresCache" />
-      </property>
-   </bean>
-   
-   <!-- override content store cleaner to use tenant routing file content store -->
-   <!-- Performs the content cleanup -->
-   <bean id="eagerContentStoreCleaner" class="org.alfresco.repo.content.cleanup.EagerContentStoreCleaner" init-method="init">
-      <property name="eagerOrphanCleanup" >
-         <value>${system.content.eagerOrphanCleanup}</value>
-      </property>
-      <property name="stores" >
-         <list>
-            <ref bean="tenantFileContentStore" />
-         </list>
-      </property>
-      <property name="listeners" >
-         <ref bean="deletedContentBackupListeners" />
-      </property>
-   </bean>
-
-   <!-- override content service to use tenant routing file content store -->
-   <bean id="contentService" parent="baseContentService">
-      <property name="store">
-          <ref bean="tenantFileContentStore" />
-      </property>
-   </bean>
-       
 </beans>