diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 65f06abfcc..c8b1014713 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -308,7 +308,9 @@
     
     <!-- Bootstrap MT (multi-tenancy) if applicable -->
     <bean id="multiTenantBootstrap" class="org.alfresco.repo.tenant.MultiTenantBootstrap" >
-        <property name="tenantAdminService" ref="tenantAdminService" />
+        <property name="tenantAdminService" ref="tenantAdminService"/>
+        <property name="patchService" ref="PatchService"/>
+        <property name="migrateAttrTenantsPatch" ref="patch.migrateAttrTenants"/>
     </bean>
        
     <!-- Bootstrap any extensions -->
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 984809b335..61edb3a6fe 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2215,12 +2215,21 @@
         </property>
     </bean>
     
+    <!--  
+         Note: MT-specific (ALF-4875)
+         
+               This patch will be applied directly (by MultiTenantBootstrap) before any tenants are started
+               and hence before any outstanding patches are applied (ie. prior to patch execution.
+               
+               Hence, fixesToSchema/targetSchema is specified as 0/1 (rather than 4106/4107) to avoid error 
+               that patch has already been applied.
+    -->
     <bean id="patch.migrateAttrTenants" class="org.alfresco.repo.admin.patch.impl.MigrateAttrTenantsPatch" parent="basePatch">
         <property name="id"><value>patch.migrateAttrTenants</value></property>
         <property name="description"><value>patch.migrateAttrTenants.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>4106</value></property>
-        <property name="targetSchema"><value>4107</value></property>
+        <property name="fixesToSchema"><value>0</value></property>
+        <property name="targetSchema"><value>1</value></property>
         <property name="applyToTenants"><value>false</value></property>
         <property name="attributeService">
             <ref bean="attributeService"/>
@@ -2228,6 +2237,11 @@
         <property name="patchDAO">
             <ref bean="patchDAO"/>
         </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V3.4-property-unique-ctx-value"/>
+            </list>
+        </property>
     </bean>
     
     <bean id="patch.migrateAttrAVMLocks" class="org.alfresco.repo.admin.patch.impl.MigrateAttrAVMLocksPatch" parent="basePatch">
@@ -2243,6 +2257,11 @@
         <property name="patchDAO">
             <ref bean="patchDAO"/>
         </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V3.4-property-unique-ctx-value"/>
+            </list>
+        </property>
     </bean>
     
     <bean id="patch.migrateAttrPropBackedBeans" class="org.alfresco.repo.admin.patch.impl.MigrateAttrPropBackedBeanPatch" parent="basePatch">
@@ -2258,6 +2277,11 @@
         <property name="patchDAO">
             <ref bean="patchDAO"/>
         </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V3.4-property-unique-ctx-value"/>
+            </list>
+        </property>
     </bean>
     
     <bean id="patch.migrateAttrChainingURS" class="org.alfresco.repo.admin.patch.impl.MigrateAttrChainingURSPatch" parent="basePatch">
@@ -2273,6 +2297,11 @@
         <property name="patchDAO">
             <ref bean="patchDAO"/>
         </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V3.4-property-unique-ctx-value"/>
+            </list>
+        </property>
     </bean>
     
     <bean id="patch.migrateAttrDelete" class="org.alfresco.repo.admin.patch.impl.MigrateAttrDeletePatch" parent="basePatch">
diff --git a/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java b/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java
index c27b04ecc7..2b5af69978 100644
--- a/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java
+++ b/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java
@@ -18,20 +18,26 @@
  */
 package org.alfresco.repo.tenant;
 
-import org.springframework.extensions.surf.util.AbstractLifecycleBean;
+import java.util.List;
+
+import org.alfresco.repo.admin.patch.AppliedPatch;
+import org.alfresco.repo.admin.patch.PatchService;
+import org.alfresco.repo.admin.patch.impl.MigrateAttrTenantsPatch;
 import org.alfresco.util.PropertyCheck;
 import org.springframework.context.ApplicationEvent;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 
 /**
- * This component is responsible for ensuring that patches are applied
- * at the appropriate time.
+ * This component is responsible for starting the enabled tenants (if MT is enabled).
  * 
- * @author Derek Hulley
+ * @author Derek Hulley, janv
  */
 public class MultiTenantBootstrap extends AbstractLifecycleBean
 {
     private TenantAdminService tenantAdminService;
-
+    private PatchService patchService;
+    private MigrateAttrTenantsPatch migrateAttrTenantsPatch;
+    
     /**
      * @param tenantAdminService        the service that will perform the bootstrap
      */
@@ -39,12 +45,47 @@ public class MultiTenantBootstrap extends AbstractLifecycleBean
     {
         this.tenantAdminService = tenantAdminService;
     }
-
+    
+    public void setPatchService(PatchService patchService)
+    {
+        this.patchService = patchService;
+    }
+    
+    public void setMigrateAttrTenantsPatch(MigrateAttrTenantsPatch migrateAttrTenantsPatch)
+    {
+        this.migrateAttrTenantsPatch = migrateAttrTenantsPatch;
+    }
+    
     @Override
     protected void onBootstrap(ApplicationEvent event)
     {
         PropertyCheck.mandatory(this, "tenantAdminService", tenantAdminService);
-        tenantAdminService.startTenants();
+        PropertyCheck.mandatory(this, "patchService", patchService);
+        
+        if (tenantAdminService.isEnabled())
+        {
+            // Upgrade to 3.4 (chicken & egg)
+            if (tenantAdminService.getAllTenants().size() == 0)
+            {
+                boolean applied = false;
+                List<AppliedPatch> appliedPatches = patchService.getPatches(null, null);
+                for (AppliedPatch appliedPatch : appliedPatches)
+                {
+                    if (appliedPatch.getId().equals("patch.migrateAttrTenants"))
+                    {
+                        applied = true;
+                        break;
+                    }
+                }
+                
+                if (! applied)
+                {
+                    migrateAttrTenantsPatch.apply();
+                }
+            }
+            
+            tenantAdminService.startTenants();
+        }
     }
 
     @Override