diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
index 04c572f78a08..391e81ddddd0 100644
--- a/dotCMS/hotfix_tracking.md
+++ b/dotCMS/hotfix_tracking.md
@@ -135,3 +135,4 @@ This maintenance release includes the following code fixes:
 128. https://github.com/dotCMS/core/issues/26477 : Search filter can't find/filter images #26477
 129. https://github.com/dotCMS/core/issues/27297 : Edit Page: Edit Contentlet Dialog Language Support #27297
 130. https://github.com/dotCMS/core/issues/26413 : Template Builder: Container Layout Editing Issue #26413
+131. https://github.com/dotCMS/core/issues/27816 : Content Displacement Bug when Editing Template #27816
\ No newline at end of file
diff --git a/dotCMS/src/integration-test/java/com/dotcms/datagen/TemplateLayoutDataGen.java b/dotCMS/src/integration-test/java/com/dotcms/datagen/TemplateLayoutDataGen.java
index 6ffd14474aa1..3445fcbe6842 100644
--- a/dotCMS/src/integration-test/java/com/dotcms/datagen/TemplateLayoutDataGen.java
+++ b/dotCMS/src/integration-test/java/com/dotcms/datagen/TemplateLayoutDataGen.java
@@ -5,12 +5,18 @@
 import com.dotmarketing.portlets.containers.model.FileAssetContainer;
 import com.dotmarketing.portlets.templates.design.bean.*;
 
+import javax.swing.*;
 import java.util.*;
 
 public class TemplateLayoutDataGen  {
 
-    final Map<String, List<String>> containersIds = new HashMap<>();
+    private List<TemplateLayoutRow> rows;
+
+    private List<TemplateLayoutColumn> currentColumns;
+
+    private Map<String, List<String>> containersIds = new HashMap<>();
     final Map<String, List<String>> containersIdsInSidebar = new HashMap<>();
+    private int currentColumnWidthPercent = 100;
 
     public static TemplateLayoutDataGen get(){
         return new TemplateLayoutDataGen();
@@ -45,16 +51,11 @@ public TemplateLayoutDataGen withContainerInSidebar(final String identifier, fin
     }
 
     public TemplateLayout next() {
-        final List<ContainerUUID> containers = createContainerUUIDS(containersIds);
-        final List<ContainerUUID> containersInSidebar = createContainerUUIDS(containersIdsInSidebar);
-
-        final List<TemplateLayoutColumn> columns = new ArrayList<>();
-        columns.add(new TemplateLayoutColumn(containers, 100, 1, null));
 
-        final  List<TemplateLayoutRow> rows = new ArrayList<>();
-        rows.add(new TemplateLayoutRow(columns, null));
+        final List<ContainerUUID> containersInSidebar = createContainerUUIDS(containersIdsInSidebar);
+        final List<TemplateLayoutRow> innerRows = rows == null ? getDefaultRow() : getRows();
 
-        final Body body = new Body(rows);
+        final Body body = new Body(innerRows);
         final TemplateLayout templateLayout = new TemplateLayout();
         templateLayout.setBody(body);
 
@@ -63,7 +64,25 @@ public TemplateLayout next() {
 
         return templateLayout;
     }
-    
+
+    private List<TemplateLayoutRow> getRows() {
+        createNewRow();
+        return rows;
+    }
+
+    private List<TemplateLayoutRow> getDefaultRow() {
+        final List<TemplateLayoutRow> rows = new ArrayList<>();
+
+        final List<ContainerUUID> containers = createContainerUUIDS(containersIds);
+
+        final List<TemplateLayoutColumn> columns = new ArrayList<>();
+        columns.add(new TemplateLayoutColumn(containers, 100, 1, null));
+
+        rows.add(new TemplateLayoutRow(columns, null));
+
+        return rows;
+    }
+
     private static List<ContainerUUID> createContainerUUIDS(Map<String, List<String>> containersIds) {
         final List<ContainerUUID> containers = new ArrayList<>();
 
@@ -86,4 +105,39 @@ public TemplateLayoutDataGen withContainer(final Container container, final Stri
     public TemplateLayoutDataGen withContainer(final Container container) {
         return withContainer(container, null);
     }
-}
+
+    public TemplateLayoutDataGen addRow() {
+
+        if (rows ==  null) {
+            rows = new ArrayList<>();
+            currentColumns = new ArrayList<>();
+        } else {
+            createNewRow();
+        }
+
+        return this;
+    }
+
+    private void createNewRow() {
+        addNewColumn();
+
+        rows.add(new TemplateLayoutRow(currentColumns, null));
+        currentColumns = new ArrayList<>();
+    }
+
+    public TemplateLayoutDataGen addColumn(final int widthPercent) {
+        if (containersIds != null && !containersIds.isEmpty()) {
+            addNewColumn();
+        }
+
+        currentColumnWidthPercent = widthPercent;
+        return this;
+    }
+
+    private void addNewColumn() {
+        final List<ContainerUUID> containers = createContainerUUIDS(containersIds);
+        currentColumns.add(new TemplateLayoutColumn(containers, currentColumnWidthPercent, 1, null));
+
+        containersIds = new HashMap<>();
+    }
+}
\ No newline at end of file
diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/factories/MultiTreeAPITest.java b/dotCMS/src/integration-test/java/com/dotmarketing/factories/MultiTreeAPITest.java
index 74e202341eb7..36d00ce60846 100644
--- a/dotCMS/src/integration-test/java/com/dotmarketing/factories/MultiTreeAPITest.java
+++ b/dotCMS/src/integration-test/java/com/dotmarketing/factories/MultiTreeAPITest.java
@@ -4,7 +4,6 @@
 import com.dotcms.contenttype.model.type.ContentType;
 import com.dotcms.datagen.*;
 import com.dotcms.experiments.model.Experiment;
-import com.dotcms.experiments.model.ExperimentVariant;
 import com.dotcms.rendering.velocity.directive.ParseContainer;
 import com.dotcms.util.IntegrationTestInitService;
 import com.dotcms.util.transform.TransformerLocator;
@@ -14,7 +13,6 @@
 import com.dotmarketing.beans.MultiTree;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.business.CacheLocator;
-import com.dotmarketing.business.Ruleable;
 import com.dotmarketing.common.db.DotConnect;
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.exception.DotSecurityException;
@@ -28,31 +26,23 @@
 import com.dotmarketing.portlets.personas.model.Persona;
 import com.dotmarketing.portlets.structure.model.Structure;
 import com.dotmarketing.portlets.templates.design.bean.ContainerUUID;
+import com.dotmarketing.portlets.templates.design.bean.LayoutChanges;
 import com.dotmarketing.portlets.templates.design.bean.TemplateLayout;
 import com.dotmarketing.portlets.templates.model.Template;
 import com.dotmarketing.startup.runonce.Task04315UpdateMultiTreePK;
+import com.dotmarketing.util.Config;
 import com.dotmarketing.util.Logger;
 import com.dotmarketing.util.UUIDGenerator;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Table;
-import com.liferay.portal.model.User;
-import graphql.AssertException;
-import io.vavr.API;
-import java.util.ArrayList;
 
-import java.util.Collection;
+import java.util.*;
+
 import org.jetbrains.annotations.NotNull;
 
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.dotcms.util.CollectionsUtils.list;
@@ -60,7 +50,7 @@
 import static org.junit.Assert.*;
 
 public class MultiTreeAPITest extends IntegrationTestBase {
-    
+
 
     private static final String CONTAINER = "CONTAINER";
     private static final String PAGE = "PAGE";
@@ -72,10 +62,10 @@ public class MultiTreeAPITest extends IntegrationTestBase {
     @BeforeClass
     public static void initData() throws Exception {
         IntegrationTestInitService.getInstance().init();
-      //  testUpgradeTask();
+        //  testUpgradeTask();
         buildInitalData();
     }
-    
+
     public static void testUpgradeTask() throws Exception {
         Task04315UpdateMultiTreePK task = Task04315UpdateMultiTreePK.class.getDeclaredConstructor().newInstance();
         task.executeUpgrade();
@@ -150,15 +140,15 @@ public  void testDeletes() throws Exception {
         deleteInitialData();
         buildInitalData() ;
         List<MultiTree> all = APILocator.getMultiTreeAPI().getAllMultiTrees();
-        
+
         List<MultiTree> list = APILocator.getMultiTreeAPI().getMultiTrees(PAGE);
 
         deleteInitialData();
         assertTrue("multiTree deletes", APILocator.getMultiTreeAPI().getAllMultiTrees().size() < all.size() );
         assertTrue("multiTree deletes", APILocator.getMultiTreeAPI().getAllMultiTrees().size() == all.size() - list.size() );
     }
-    
-    
+
+
     @Test
     public  void testReorder() throws Exception {
         deleteInitialData();
@@ -245,22 +235,22 @@ public  void testReorderWithVariant() throws Exception {
         assertTrue("multiTree reorders", ((Map) arrayList_3.get(3)).get("child").equals("CONTENTLET3"));
         assertTrue("multiTree reorders", ((Map) arrayList_3.get(4)).get("child").equals("CONTENTLET4"));
     }
-    
+
     @Test
     public  void findByChild() throws Exception {
         deleteInitialData();
         buildInitalData() ;
-        
+
         List<MultiTree> list = APILocator.getMultiTreeAPI().getMultiTreesByChild(CONTENTLET + "0");
-        
+
         assertTrue("getByChild returns all results", list.size() == runs );
-        
-        
-        
+
+
+
     }
-    
-    
-    
+
+
+
     @AfterClass
     public static void deleteInitialData() throws Exception {
 
@@ -271,11 +261,11 @@ public static void deleteInitialData() throws Exception {
         }
 
     }
-    
-    
-    
-    
-    
+
+
+
+
+
     @Test
     public  void testSaveMultiTree() throws Exception {
         MultiTree mt = new MultiTree()
@@ -284,40 +274,40 @@ public  void testSaveMultiTree() throws Exception {
                 .setContentlet("NEW_ONE")
                 .setTreeOrder(0)
                 .setInstanceId(RELATION_TYPE + 0);
-        
+
         APILocator.getMultiTreeAPI().saveMultiTree(mt);
-        
+
         MultiTree mt2 = APILocator.getMultiTreeAPI().getMultiTree(mt.getHtmlPage(), mt.getContainer(), mt.getContentlet(), mt.getRelationType());
         assertTrue("multiTree save and get equals", mt.equals(mt2));
     }
-    
-    
-    
 
-    
-    
-    
+
+
+
+
+
+
     @Test
     public void testLegacyMultiTreeSave() throws Exception {
 
-        
+
         long time = System.currentTimeMillis();
 
-        
+
         MultiTree multiTree = new MultiTree();
         multiTree.setHtmlPage( PAGE+time);
         multiTree.setContainer( CONTAINER +time);
         multiTree.setContentlet( CONTENTLET +time);
         multiTree.setTreeOrder( 1 );
         APILocator.getMultiTreeAPI().saveMultiTree( multiTree );
-        
-        
+
+
         MultiTree mt2 = APILocator.getMultiTreeAPI().getMultiTree(PAGE+time, CONTAINER +time, CONTENTLET +time, Container.LEGACY_RELATION_TYPE);
-        
+
         assertTrue("multiTree save without relationtype and get equals", multiTree.equals(mt2));
     }
-    
-    
+
+
     @Test
     public void testGetPageMultiTrees() throws Exception {
         final Template template = new TemplateDataGen().nextPersisted();
@@ -334,12 +324,12 @@ public void testGetPageMultiTrees() throws Exception {
         multiTree.setInstanceId("abc");
         multiTree.setPersonalization(DOT_PERSONALIZATION_DEFAULT);
         multiTree.setTreeOrder( 1 );
-        
+
         //delete out any previous relation
         APILocator.getMultiTreeAPI().deleteMultiTree(multiTree);
         CacheLocator.getMultiTreeCache().clearCache();
         Table<String, String, Set<PersonalizedContentlet>> trees= APILocator.getMultiTreeAPI().getPageMultiTrees(page, false);
-        
+
         Table<String, String, Set<PersonalizedContentlet>> cachedTrees= APILocator.getMultiTreeAPI().getPageMultiTrees(page, false);
 
         Logger.info(this, "\n\n**** cachedTrees: " + cachedTrees);
@@ -349,14 +339,14 @@ public void testGetPageMultiTrees() throws Exception {
         CacheLocator.getMultiTreeCache().removePageMultiTrees(page.getIdentifier(), VariantAPI.DEFAULT_VARIANT.name());
 
         trees= APILocator.getMultiTreeAPI().getPageMultiTrees(page, false);
-        
+
         // cache flush forced a cache reload, so different objects in memory
         assert(trees!=cachedTrees);
-        
+
         // but the objects should contain the same data
         assert(trees.equals(cachedTrees));
 
-        // there is no container entry 
+        // there is no container entry
         assert(!(cachedTrees.rowKeySet().contains(container.getIdentifier())));
 
 
@@ -364,7 +354,7 @@ public void testGetPageMultiTrees() throws Exception {
         APILocator.getMultiTreeAPI().saveMultiTree( multiTree );
         Table<String, String, Set<PersonalizedContentlet>> addedTrees= APILocator.getMultiTreeAPI().getPageMultiTrees(page, false);
         assert(cachedTrees!=addedTrees);
-        
+
         // did we get a new object from the cache?
         Assert.assertNotNull(cachedTrees);
         Assert.assertNotNull(addedTrees);
@@ -372,88 +362,88 @@ public void testGetPageMultiTrees() throws Exception {
         Logger.info(this, "\n\n**** addedTrees: " + addedTrees);
         assertNotEquals(cachedTrees, addedTrees);
         assert(addedTrees.rowKeySet().contains(container.getIdentifier()));
-        
+
         // check cache flush on delete
         APILocator.getMultiTreeAPI().deleteMultiTree(multiTree );
         Table<String, String, Set<PersonalizedContentlet>> deletedTrees= APILocator.getMultiTreeAPI().getPageMultiTrees(page, false);
-        
+
         // did we get a new object from the cache?
         assert(!(addedTrees.equals(deletedTrees)));
         assert(!(deletedTrees.rowKeySet().contains(container.getIdentifier())));
     }
 
-    
-    
-  /**
-   * This test makes sure that if you have a container that accepts 1 contentlet, then that container
-   * will take 1 contentlet for each persona and not just 1 contentlet in total.  See:
-   * https://github.com/dotCMS/core/issues/17181
-   * 
-   * @throws Exception
-   */
-  @Test
-  public void test_personalize_page_respects_max_contentlet_value_per_persona() throws Exception {
-
-    final Template template = new TemplateDataGen().body("body").nextPersisted();
-    final Folder folder = new FolderDataGen().nextPersisted();
-    final HTMLPageAsset page = new HTMLPageDataGen(folder, template).nextPersisted();
-    final Structure structure = new StructureDataGen().nextPersisted();
-    final Container container = new ContainerDataGen().maxContentlets(1).withStructure(structure, "").nextPersisted();
-    final Contentlet content1 = new ContentletDataGen(structure.getInode()).nextPersisted();
-    final Contentlet content2 = new ContentletDataGen(structure.getInode()).nextPersisted();
-
-    final Persona persona = new PersonaDataGen().keyTag(UUIDGenerator.shorty()).nextPersisted();
-    final String uniqueId = UUIDGenerator.shorty();
-
-    MultiTree multiTree = new MultiTree();
-    multiTree.setHtmlPage(page);
-    multiTree.setContainer(container);
-    multiTree.setContentlet(content1);
-    multiTree.setInstanceId(uniqueId);
-    multiTree.setPersonalization(DOT_PERSONALIZATION_DEFAULT);
-    multiTree.setTreeOrder(1);
-    APILocator.getMultiTreeAPI().saveMultiTree(multiTree);
-
-    multiTree = new MultiTree();
-    multiTree.setHtmlPage(page);
-    multiTree.setContainer(container);
-    multiTree.setContentlet(content2);
-    multiTree.setInstanceId(uniqueId);
-    multiTree.setPersonalization(persona.getKeyTag());
-    multiTree.setTreeOrder(1);
-    APILocator.getMultiTreeAPI().saveMultiTree(multiTree);
-
-    Table<String, String, Set<PersonalizedContentlet>> pageContents = APILocator.getMultiTreeAPI().getPageMultiTrees(page, false);
-
-    for (final String containerId : pageContents.rowKeySet()) {
-      assertEquals("containers match. Saved:" + container.getIdentifier() + ", got:" + containerId, containerId, container.getIdentifier());
-
-      for (final String uuid : pageContents.row(containerId).keySet()) {
-        assertEquals("containers uuids match. Saved:" + uniqueId + ", got:" + uuid, uniqueId, uuid);
-        final Set<PersonalizedContentlet> personalizedContentletSet = pageContents.get(containerId, uniqueId);
-
-        assertTrue("container should have 2 personalized contents - got :" + personalizedContentletSet.size(),
-            personalizedContentletSet.size() == 2);
-        assertTrue("container should have contentlet for keyTag:" + DOT_PERSONALIZATION_DEFAULT, personalizedContentletSet
-            .contains(new PersonalizedContentlet(content1.getIdentifier(), DOT_PERSONALIZATION_DEFAULT)));
-        assertTrue("container should have contentlet for persona:" + persona.getKeyTag(),
-            personalizedContentletSet.contains(new PersonalizedContentlet(content2.getIdentifier(), persona.getKeyTag())));
-      }
-
-    }
-
-  }
+
+
+    /**
+     * This test makes sure that if you have a container that accepts 1 contentlet, then that container
+     * will take 1 contentlet for each persona and not just 1 contentlet in total.  See:
+     * https://github.com/dotCMS/core/issues/17181
+     *
+     * @throws Exception
+     */
+    @Test
+    public void test_personalize_page_respects_max_contentlet_value_per_persona() throws Exception {
+
+        final Template template = new TemplateDataGen().body("body").nextPersisted();
+        final Folder folder = new FolderDataGen().nextPersisted();
+        final HTMLPageAsset page = new HTMLPageDataGen(folder, template).nextPersisted();
+        final Structure structure = new StructureDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().maxContentlets(1).withStructure(structure, "").nextPersisted();
+        final Contentlet content1 = new ContentletDataGen(structure.getInode()).nextPersisted();
+        final Contentlet content2 = new ContentletDataGen(structure.getInode()).nextPersisted();
+
+        final Persona persona = new PersonaDataGen().keyTag(UUIDGenerator.shorty()).nextPersisted();
+        final String uniqueId = UUIDGenerator.shorty();
+
+        MultiTree multiTree = new MultiTree();
+        multiTree.setHtmlPage(page);
+        multiTree.setContainer(container);
+        multiTree.setContentlet(content1);
+        multiTree.setInstanceId(uniqueId);
+        multiTree.setPersonalization(DOT_PERSONALIZATION_DEFAULT);
+        multiTree.setTreeOrder(1);
+        APILocator.getMultiTreeAPI().saveMultiTree(multiTree);
+
+        multiTree = new MultiTree();
+        multiTree.setHtmlPage(page);
+        multiTree.setContainer(container);
+        multiTree.setContentlet(content2);
+        multiTree.setInstanceId(uniqueId);
+        multiTree.setPersonalization(persona.getKeyTag());
+        multiTree.setTreeOrder(1);
+        APILocator.getMultiTreeAPI().saveMultiTree(multiTree);
+
+        Table<String, String, Set<PersonalizedContentlet>> pageContents = APILocator.getMultiTreeAPI().getPageMultiTrees(page, false);
+
+        for (final String containerId : pageContents.rowKeySet()) {
+            assertEquals("containers match. Saved:" + container.getIdentifier() + ", got:" + containerId, containerId, container.getIdentifier());
+
+            for (final String uuid : pageContents.row(containerId).keySet()) {
+                assertEquals("containers uuids match. Saved:" + uniqueId + ", got:" + uuid, uniqueId, uuid);
+                final Set<PersonalizedContentlet> personalizedContentletSet = pageContents.get(containerId, uniqueId);
+
+                assertTrue("container should have 2 personalized contents - got :" + personalizedContentletSet.size(),
+                        personalizedContentletSet.size() == 2);
+                assertTrue("container should have contentlet for keyTag:" + DOT_PERSONALIZATION_DEFAULT, personalizedContentletSet
+                        .contains(new PersonalizedContentlet(content1.getIdentifier(), DOT_PERSONALIZATION_DEFAULT)));
+                assertTrue("container should have contentlet for persona:" + persona.getKeyTag(),
+                        personalizedContentletSet.contains(new PersonalizedContentlet(content2.getIdentifier(), persona.getKeyTag())));
+            }
+
+        }
+
+    }
 
     @Test
     public void testMultiTreeForContainerStructure() throws Exception {
 
         //THIS USES THE INDEX WHICH IS SOMETIMES NOT THERE LOCALLY
         //final Contentlet contentlet = APILocator.getContentletAPIImpl().findAllContent(0,1).get(0);
-        
+
         Map<String, Object> map = new DotConnect().setSQL("select * from contentlet_version_info").setMaxRows(1).loadObjectResults().get(0);
         final Contentlet contentlet = APILocator.getContentletAPIImpl().find(map.get("working_inode").toString(), APILocator.systemUser(), false);
-        
-        
+
+
 
         //Create a MultiTree and relate it to that Contentlet
         MultiTree mt = new MultiTree()
@@ -491,20 +481,20 @@ public void testMultiTreesSave() throws Exception {
         final String parent1 = PAGE + time;
 
         MultiTree multiTree1 = new MultiTree()
-        .setHtmlPage(parent1 )
-        .setContainer( CONTAINER +time)
-        .setContentlet( CONTENTLET +time)
-        .setInstanceId("1")
-        .setTreeOrder( 1 );
+                .setHtmlPage(parent1 )
+                .setContainer( CONTAINER +time)
+                .setContentlet( CONTENTLET +time)
+                .setInstanceId("1")
+                .setTreeOrder( 1 );
 
         long time2 = time + 1;
 
         MultiTree multiTree2 = new MultiTree()
-        .setHtmlPage( parent1 )
-        .setContainer( CONTAINER + time2)
-        .setContentlet( CONTENTLET + time2)
-        .setInstanceId("1")
-        .setTreeOrder( 2 );
+                .setHtmlPage( parent1 )
+                .setContainer( CONTAINER + time2)
+                .setContentlet( CONTENTLET + time2)
+                .setInstanceId("1")
+                .setTreeOrder( 2 );
 
         APILocator.getMultiTreeAPI().saveMultiTrees( parent1, VariantAPI.DEFAULT_VARIANT.name(),
                 list(multiTree1, multiTree2) );
@@ -604,9 +594,9 @@ public void testMultiTreesSaveAndPersonalizationForPage() throws Exception {
         final Container container = new ContainerDataGen().withStructure(structure, "").nextPersisted();
         final Contentlet content = new ContentletDataGen(structure.getInode()).nextPersisted();
 
-        
-        
-        
+
+
+
         final MultiTreeAPI multiTreeAPI = new MultiTreeAPIImpl();
 
         final String personalization    = "dot:persona:somepersona";
@@ -986,14 +976,14 @@ public void shouldReplaceVariantAndPersonalizationMultiTree() throws Exception {
                 assertEquals(variantA.name(), multiTree.getVariantId());
                 assertEquals(DOT_PERSONALIZATION_DEFAULT, multiTree.getPersonalization());
             } else {
-                throw new AssertException("Contentlet not expected");
+                throw new AssertionError("Contentlet not expected");
             }
         }
     }
 
     /**
      * Method to Test: {@link MultiTreeAPI#getMultiTreesByVariant(String, String)} (String, String)}
-     * When: Create a Page with {@link MultiTree} is different {@link Variant} and call the 
+     * When: Create a Page with {@link MultiTree} is different {@link Variant} and call the
      * {@link MultiTreeAPI#getMultiTreesByVariant(String, String)} method just for a specific {@link Variant}
      * Should: Return just the {@link MultiTree} for that {@link Variant}
      */
@@ -1388,13 +1378,13 @@ public void shouldReplaceEnglishMultiTree() throws Exception {
         final String uniqueId = UUIDGenerator.shorty();
 
         new MultiTreeDataGen()
-            .setPage(page)
-            .setContainer(container)
-            .setContentlet(enContentlet)
-            .setInstanceID(uniqueId)
-            .setPersonalization(DOT_PERSONALIZATION_DEFAULT)
-            .setTreeOrder(1)
-            .nextPersisted();
+                .setPage(page)
+                .setContainer(container)
+                .setContentlet(enContentlet)
+                .setInstanceID(uniqueId)
+                .setPersonalization(DOT_PERSONALIZATION_DEFAULT)
+                .setTreeOrder(1)
+                .nextPersisted();
 
         new MultiTreeDataGen()
                 .setPage(page)
@@ -1552,10 +1542,10 @@ public void testEmptyContainersInAdvancedTemplate() throws DotDataException, Dot
 
         final Table<String, String, Set<PersonalizedContentlet>> pageMultiTrees = APILocator.getMultiTreeAPI().getPageMultiTrees(page, false);
 
-        pageMultiTrees.rowKeySet().contains(container.getIdentifier());
-        pageMultiTrees.rowKeySet().contains(emptyContainer.getIdentifier());
-        pageMultiTrees.rowKeySet().contains(fileAssetContainer.getIdentifier());
-        pageMultiTrees.rowKeySet().contains(emptyFileAssetContainer.getIdentifier());
+        assertTrue(pageMultiTrees.rowKeySet().contains(container.getIdentifier()));
+        assertTrue(pageMultiTrees.rowKeySet().contains(emptyContainer.getIdentifier()));
+        assertTrue(pageMultiTrees.rowKeySet().contains(fileAssetContainer.getIdentifier()));
+        assertTrue(pageMultiTrees.rowKeySet().contains(emptyFileAssetContainer.getIdentifier()));
     }
 
     /**
@@ -1593,10 +1583,10 @@ public void testEmptyContainersInDrawedTemplate() throws DotDataException, DotSe
 
         final Table<String, String, Set<PersonalizedContentlet>> pageMultiTrees = APILocator.getMultiTreeAPI().getPageMultiTrees(page, false);
 
-        pageMultiTrees.rowKeySet().contains(container.getIdentifier());
-        pageMultiTrees.rowKeySet().contains(emptyContainer.getIdentifier());
-        pageMultiTrees.rowKeySet().contains(fileAssetContainer.getIdentifier());
-        pageMultiTrees.rowKeySet().contains(emptyFileAssetContainer.getIdentifier());
+        assertTrue(pageMultiTrees.rowKeySet().contains(container.getIdentifier()));
+        assertTrue(pageMultiTrees.rowKeySet().contains(emptyContainer.getIdentifier()));
+        assertTrue(pageMultiTrees.rowKeySet().contains(fileAssetContainer.getIdentifier()));
+        assertTrue(pageMultiTrees.rowKeySet().contains(emptyFileAssetContainer.getIdentifier()));
     }
 
     private void createContentAndMultiTree(Container container, FileAssetContainer fileAssetContainer, HTMLPageAsset page) {
@@ -1982,18 +1972,18 @@ public void multiTreesByVariant() throws DotDataException {
 
         assertEquals(3, multiTreeList.size());
         multiTreeList.stream().map(MultiTree::getContentlet).forEach(contentletId ->
-            assertTrue(contentlet_1_variant_1.getIdentifier().equals(contentletId)
-                    || contentlet_2_variant_1.getIdentifier().equals(contentletId)
-                    || contentlet_3_variant_1.getIdentifier().equals(contentletId))
+                assertTrue(contentlet_1_variant_1.getIdentifier().equals(contentletId)
+                        || contentlet_2_variant_1.getIdentifier().equals(contentletId)
+                        || contentlet_3_variant_1.getIdentifier().equals(contentletId))
         );
 
         final List<MultiTree> multiTreeList_2 = APILocator.getMultiTreeAPI().getMultiTrees(variant_2);
 
         assertEquals(3, multiTreeList_2.size());
         multiTreeList_2.stream().map(MultiTree::getContentlet).forEach(contentletId ->
-            assertTrue(contentlet_1_variant_2.getIdentifier().equals(contentletId)
-                    || contentlet_2_variant_2.getIdentifier().equals(contentletId)
-                    || contentlet_3_variant_2.getIdentifier().equals(contentletId))
+                assertTrue(contentlet_1_variant_2.getIdentifier().equals(contentletId)
+                        || contentlet_2_variant_2.getIdentifier().equals(contentletId)
+                        || contentlet_3_variant_2.getIdentifier().equals(contentletId))
         );
 
     }
@@ -2701,7 +2691,7 @@ public void copyFromSpecificVariantToSpecificVariantNotDefaultPeronalizations()
 
     @NotNull
     private static List<String> getContentsId(final String personaKey, final HTMLPageAsset page,
-            final Variant variant) throws DotDataException {
+                                              final Variant variant) throws DotDataException {
         final List<String> contents = new DotConnect().setSQL(
                         "SELECT child FROM multi_tree WHERE variant_id = ? AND parent1 = ? AND personalization = ?")
                 .addParam(variant.name())
@@ -2913,4 +2903,1249 @@ public void deletePersonalizationSpecificVariant() throws DotDataException {
         assertEquals(1, APILocator.getMultiTreeAPI().getAllContentletReferencesCount(contentlet_4.getIdentifier()));
         assertEquals(1, APILocator.getMultiTreeAPI().getAllContentletReferencesCount(contentlet_5.getIdentifier()));
     }
-}
+
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have a Page with 4 containers all of them are different instances of the same containers,
+     * and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 4
+     *
+     * And you move the last instance to be the first one
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 2
+     * - Contentlet_2 : Add to the instance 3
+     * - Contentlet_3 : Add to the instance 4
+     * - Contentlet_5 : Add to the instance 4
+     * - Contentlet_4 : Add to the instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveContainerUpdateMultiTrees() throws DotDataException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container, "1")
+                .withContainer(container, "2")
+                .withContainer(container, "3")
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        createMultiTrees(page, container, contentlet_1, contentlet_2, contentlet_3, contentlet_4, contentlet_5);
+
+        final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                .change(container.getIdentifier(), "4", "1")
+                .change(container.getIdentifier(), "1", "2")
+                .change(container.getIdentifier(), "2", "3")
+                .change(container.getIdentifier(), "3", "4")
+                .build();
+
+        APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, list(page.getIdentifier()));
+
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_4.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "2":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "3":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "4":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(MultiTree::getContentlet)
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_5.getIdentifier()));
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have a Page with 4 containers all of them are different instances of the same containers,
+     * and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 4
+     *
+     * And you move the instance 2 and 3
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 3
+     * - Contentlet_3 : Add to the instance 2
+     * - Contentlet_5 : Add to the instance 2
+     * - Contentlet_4 : Add to the instance 4
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveJustTwoContainerUpdateMultiTrees() throws DotDataException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container, "1")
+                .withContainer(container, "2")
+                .withContainer(container, "3")
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        createMultiTrees(page, container, contentlet_1, contentlet_2, contentlet_3, contentlet_4, contentlet_5);
+
+        final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                .change(container.getIdentifier(), "2", "3")
+                .change(container.getIdentifier(), "3", "2")
+                .build();
+
+        APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, list(page.getIdentifier()));
+
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "2":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(MultiTree::getContentlet)
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_5.getIdentifier()));
+                    break;
+                case "3":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "4":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_4.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have a Page with 4 containers all of them are different instances of the same containers,
+     * and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 4
+     *
+     * And you remove the instance 1
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_1 : removed
+     * - Contentlet_2 : Add to the instance 1
+     * - Contentlet_3 : Add to the instance 2
+     * - Contentlet_5 : Add to the instance 2
+     * - Contentlet_4 : Add to the instance 3
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerUpdateMultiTrees() throws DotDataException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container, "1")
+                .withContainer(container, "2")
+                .withContainer(container, "3")
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        createMultiTrees(page, container, contentlet_1, contentlet_2, contentlet_3, contentlet_4, contentlet_5);
+
+        final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                .remove(container.getIdentifier(), "1")
+                .change(container.getIdentifier(), "2", "1")
+                .change(container.getIdentifier(), "3", "2")
+                .change(container.getIdentifier(), "4", "3")
+                .build();
+
+        APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, list(page.getIdentifier()));
+
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(4, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "2":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_5.getIdentifier()));
+                    break;
+                case "3":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_4.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+
+    private static void createMultiTrees(final HTMLPageAsset page,
+                                         Container container, Contentlet... contentlets) {
+
+        final Contentlet contentlet_1 = contentlets[0];
+        final Contentlet contentlet_2 = contentlets[1];
+        final Contentlet contentlet_3 = contentlets[2];
+        final Contentlet contentlet_4 = contentlets[3];
+        final Contentlet contentlet_5 = contentlets[4];
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("2")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("4")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+    }
+
+    private Map<String, List<Map<String, Object>>> getMultiTreeByPageOrderByInstanceId(final String pageId,
+                                                                                       final ArrayList<Map<String, Object>> multiTreeResult,
+                                                                                       final int multiTreeCurrentIndex) {
+        int innerMultiCurrentIndex = multiTreeCurrentIndex;
+        final Map<String, List<Map<String, Object>>> multiTreesFromDB = new HashMap<>();
+
+        while (innerMultiCurrentIndex < multiTreeResult.size()) {
+            Map<String, Object> multiTreeMap = multiTreeResult.get(innerMultiCurrentIndex);
+
+            if (pageId.equals(multiTreeMap.get("parent1").toString())) {
+                String relationType = multiTreeMap.get("relation_type").toString();
+                innerMultiCurrentIndex++;
+
+                List<Map<String, Object>> contentlets = multiTreesFromDB.get(relationType);
+
+                if (contentlets == null) {
+                    contentlets = new ArrayList<>();
+
+                }
+                contentlets.add(multiTreeMap);
+                multiTreesFromDB.put(relationType, contentlets);
+            } else {
+                break;
+            }
+        }
+
+        return multiTreesFromDB;
+    }
+
+    private List<Map<String, Object>>getMultiTreeByPageOrder(final String pageId,
+                                                             final ArrayList<Map<String, Object>> multiTreeResult,
+                                                             final int multiTreeCurrentIndex) {
+        int innerMultiCurrentIndex = multiTreeCurrentIndex;
+        final List<Map<String, Object>> multiTreesFromDB = new ArrayList<>();
+
+        while (innerMultiCurrentIndex < multiTreeResult.size()) {
+            Map<String, Object> multiTreeMap = multiTreeResult.get(innerMultiCurrentIndex);
+
+            if (pageId.equals(multiTreeMap.get("parent1").toString())) {
+                innerMultiCurrentIndex++;
+                multiTreesFromDB.add(multiTreeMap);
+            } else {
+                break;
+            }
+        }
+
+        return multiTreesFromDB;
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have 10 Page with 4 containers all of them are different instances of the same containers,
+     * and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 4
+     *
+     * And you move last the instance to be the first one
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 2
+     * - Contentlet_2 : Add to the instance 3
+     * - Contentlet_3 : Add to the instance 4
+     * - Contentlet_5 : Add to the instance 4
+     * - Contentlet_4 : Add to the instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveContainerUpdateMultiTreesOnMultiplePages() throws DotDataException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container, "1")
+                .withContainer(container, "2")
+                .withContainer(container, "3")
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                .change(container.getIdentifier(), "4", "1")
+                .change(container.getIdentifier(), "1", "2")
+                .change(container.getIdentifier(), "2", "3")
+                .change(container.getIdentifier(), "3", "4")
+                .build();
+
+        final int pagesNumber = 20;
+        final HTMLPageAsset[] pages = new HTMLPageAsset[pagesNumber];
+
+        for (int i = 0; i < pagesNumber; i++) {
+            pages[i] = new HTMLPageDataGen(host, template).nextPersisted();
+            createMultiTrees(pages[i], container, contentlet_1, contentlet_2, contentlet_3, contentlet_4, contentlet_5);
+
+        }
+
+        final List<String> pageIds = Arrays.stream(pages)
+                .map(page -> page.getIdentifier())
+                .sorted(String::compareTo)
+                .collect(Collectors.toList());
+
+        APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, pageIds);
+
+        final String getMultiTreeQuery = "SELECT parent1,parent2,child,relation_type FROM multi_tree WHERE parent1 in (?" +
+                new String(new char[pageIds.size() - 1]).replace("\0", ", ?") + ") order by parent1";
+
+        final DotConnect dotConnect = new DotConnect().setSQL(getMultiTreeQuery);
+
+        pageIds.stream().forEach(pageId -> dotConnect.addParam(pageId));
+        final ArrayList<Map<String, Object>> multiTreeResult = dotConnect.loadResults();
+        int multiTreeCurrentIndex = 0;
+
+        for (int i = 0; i < pagesNumber; i++) {
+
+            final Map<String, List<Map<String, Object>>> groupedByInstanceId = getMultiTreeByPageOrderByInstanceId(pageIds.get(i),
+                    multiTreeResult, multiTreeCurrentIndex);
+
+            final int size = groupedByInstanceId.values().stream().map(List::size).reduce(0, Integer::sum);
+            multiTreeCurrentIndex = multiTreeCurrentIndex + size;
+
+            assertEquals(5, size);
+
+            for (final String intanceId : groupedByInstanceId.keySet()) {
+                final List<Map<String, Object>> multiTrees = groupedByInstanceId.get(intanceId);
+
+                switch (intanceId) {
+                    case "1":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_4.getIdentifier(), multiTrees.get(0).get("child"));
+                        break;
+                    case "2":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).get("child"));
+                        break;
+                    case "3":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).get("child"));
+                        break;
+                    case "4":
+                        assertEquals(2, multiTrees.size());
+
+                        List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.get("child").toString())
+                                .collect(Collectors.toList());
+                        assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                        assertTrue(contentlets.contains(contentlet_5.getIdentifier()));
+                        break;
+                    default:
+                        throw new AssertionError("UUID not expected: " + intanceId);
+                }
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have 100 Page with 4 containers all of them are different instances of the same containers,
+     * and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 4
+     *
+     * Should: Return the list of pages under 100 millis
+     *
+     * @throws DotDataException
+     */
+    @Test
+    @Ignore
+    public void moveContainerUpdateMultiTreesOnMultiplePagesPerformance() throws DotDataException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container, "1")
+                .withContainer(container, "2")
+                .withContainer(container, "3")
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                .change(container.getIdentifier(), "4", "1")
+                .change(container.getIdentifier(), "1", "2")
+                .change(container.getIdentifier(), "2", "3")
+                .change(container.getIdentifier(), "3", "4")
+                .build();
+
+        final int pagesNumber = 100;
+        final HTMLPageAsset[] pages = new HTMLPageAsset[pagesNumber];
+
+        for (int i = 0; i < pagesNumber; i++) {
+            pages[i] = new HTMLPageDataGen(host, template).nextPersisted();
+            createMultiTrees(pages[i], container, contentlet_1, contentlet_2, contentlet_3, contentlet_4, contentlet_5);
+
+        }
+
+        final List<String> pageIds = Arrays.stream(pages)
+                .map(page -> page.getIdentifier())
+                .sorted(String::compareTo)
+                .collect(Collectors.toList());
+
+        long start = System.currentTimeMillis();
+        APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, pageIds);
+        long end = System.currentTimeMillis();
+
+        assertTrue((end - start) < 100);
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have 20 Pages with 4 containers all of them are different instances of the same containers,
+     * and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 4
+     *
+     * And you remove the instance 1
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_1 : removed
+     * - Contentlet_2 : Add to the instance 1
+     * - Contentlet_3 : Add to the instance 2
+     * - Contentlet_5 : Add to the instance 2
+     * - Contentlet_4 : Add to the instance 3
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerUpdateMultiTreesMultiPages() throws DotDataException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container, "1")
+                .withContainer(container, "2")
+                .withContainer(container, "3")
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final int pagesNumber = 20;
+        final HTMLPageAsset[] pages = new HTMLPageAsset[pagesNumber];
+
+        for (int i = 0; i < pagesNumber; i++) {
+            pages[i] = new HTMLPageDataGen(host, template).nextPersisted();
+            createMultiTrees(pages[i], container, contentlet_1, contentlet_2, contentlet_3, contentlet_4, contentlet_5);
+
+        }
+
+        final List<String> pageIds = Arrays.stream(pages)
+                .map(page -> page.getIdentifier())
+                .sorted(String::compareTo)
+                .collect(Collectors.toList());
+
+        final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                .remove(container.getIdentifier(), "1")
+                .change(container.getIdentifier(), "2", "1")
+                .change(container.getIdentifier(), "3", "2")
+                .change(container.getIdentifier(), "4", "3")
+                .build();
+
+        APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, pageIds);
+
+        final String getMultiTreeQuery = "SELECT parent1,parent2,child,relation_type FROM multi_tree WHERE parent1 in (?" +
+                new String(new char[pageIds.size() - 1]).replace("\0", ", ?") + ") order by parent1";
+
+        final DotConnect dotConnect = new DotConnect().setSQL(getMultiTreeQuery);
+
+        pageIds.stream().forEach(pageId -> dotConnect.addParam(pageId));
+
+        final ArrayList<Map<String, Object>> multiTreeResult = dotConnect.loadResults();
+        int multiTreeCurrentIndex = 0;
+
+        for (int i = 0; i < pagesNumber; i++) {
+
+            final Map<String, List<Map<String, Object>>> groupedByInstanceId = getMultiTreeByPageOrderByInstanceId(pageIds.get(i), multiTreeResult,
+                    multiTreeCurrentIndex);
+
+            final int size = groupedByInstanceId.values().stream().map(List::size).reduce(0, Integer::sum);
+            multiTreeCurrentIndex = multiTreeCurrentIndex + size;
+
+            assertEquals(4, size);
+
+            for (final String intanceId : groupedByInstanceId.keySet()) {
+                final List<Map<String, Object>> multiTrees = groupedByInstanceId.get(intanceId);
+
+                switch (intanceId) {
+                    case "1":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).get("child").toString());
+                        break;
+                    case "2":
+                        assertEquals(2, multiTrees.size());
+
+                        List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.get("child").toString())
+                                .collect(Collectors.toList());
+                        assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                        assertTrue(contentlets.contains(contentlet_5.getIdentifier()));
+                        break;
+                    case "3":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_4.getIdentifier(), multiTrees.get(0).get("child").toString());
+                        break;
+                    default:
+                        throw new AssertionError("UUID not expected: " + intanceId);
+                }
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have a Page with 5 containers instances from 3 different containers,
+     * and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1, Container 1
+     * - Contentlet_2 : Add to the instance 1, Container 2
+     * - Contentlet_3 : Add to the instance 2, Container 2
+     * - Contentlet_4 : Add to the instance 1, Container 3
+     * - Contentlet_5 : Add to the instance 2, Container 1
+     *
+     * And you move the Inatnce 2 of the Container 1  for to be the first one
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_5 : Add to the instance 1, Container 1
+     * - Contentlet_1 : Add to the instance 2, Container 1
+     * - Contentlet_2 : Add to the instance 1, Container 2
+     * - Contentlet_3 : Add to the instance 2, Container 2
+     * - Contentlet_4 : Add to the instance 1, Container 3
+
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveContainersUpdateMultiTrees() throws DotDataException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container_1, "1")
+                .withContainer(container_2, "1")
+                .withContainer(container_2, "2")
+                .withContainer(container_3, "1")
+                .withContainer(container_1, "2")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                .change(container_1.getIdentifier(), "2", "1")
+                .change(container_1.getIdentifier(), "1", "2")
+                .build();
+
+        APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, list(page.getIdentifier()));
+
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        for (MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContainer().equals(container_1.getIdentifier()) && multiTree.getRelationType().equals("1")) {
+                assertEquals(contentlet_4.getIdentifier(), multiTree.getContentlet());
+            } else if (multiTree.getContainer().equals(container_1.getIdentifier()) && multiTree.getRelationType().equals("2")) {
+                assertEquals(contentlet_1.getIdentifier(), multiTree.getContentlet());
+            } else if (multiTree.getContainer().equals(container_2.getIdentifier()) && multiTree.getRelationType().equals("1")) {
+                assertEquals(contentlet_2.getIdentifier(), multiTree.getContentlet());
+            }else if (multiTree.getContainer().equals(container_2.getIdentifier()) && multiTree.getRelationType().equals("2")) {
+                assertEquals(contentlet_3.getIdentifier(), multiTree.getContentlet());
+            } else if (multiTree.getContainer().equals(container_3.getIdentifier()) && multiTree.getRelationType().equals("1")) {
+                assertEquals(contentlet_5.getIdentifier(), multiTree.getContentlet());
+            }else {
+                throw new AssertionError("UUID not expected: Container " + multiTree.getContainer() + " UUID " + multiTree.getRelationType());
+            }
+        }
+
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have a Page with 5 containers instances from 3 different containers,
+     * and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1, Container 1
+     * - Contentlet_2 : Add to the instance 1, Container 2
+     * - Contentlet_3 : Add to the instance 2, Container 2
+     * - Contentlet_4 : Add to the instance 1, Container 3
+     * - Contentlet_5 : Add to the instance 2, Container 1
+     *
+     * And you remove the instance 1 of COntainer 1
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Removed
+     * - Contentlet_2 : Add to the instance 1, Container 2
+     * - Contentlet_3 : Add to the instance 2, Container 2
+     * - Contentlet_4 : Add to the instance 1, Container 3
+     * - Contentlet_5 : Add to the instance 2, Container 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainersUpdateMultiTrees() throws DotDataException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container_1, "1")
+                .withContainer(container_2, "1")
+                .withContainer(container_2, "2")
+                .withContainer(container_3, "1")
+                .withContainer(container_1, "2")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                .remove(container_1.getIdentifier(), "1")
+                .change(container_1.getIdentifier(), "2", "1")
+                .build();
+
+        APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, list(page.getIdentifier()));
+
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(4, multiTreesFromDB.size());
+
+        for (MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContainer().equals(container_1.getIdentifier()) && multiTree.getRelationType().equals("1")) {
+                assertEquals(contentlet_5.getIdentifier(), multiTree.getContentlet());
+            } else if (multiTree.getContainer().equals(container_2.getIdentifier()) && multiTree.getRelationType().equals("1")) {
+                assertEquals(contentlet_2.getIdentifier(), multiTree.getContentlet());
+            } else if (multiTree.getContainer().equals(container_2.getIdentifier()) && multiTree.getRelationType().equals("2")) {
+                assertEquals(contentlet_3.getIdentifier(), multiTree.getContentlet());
+            } else if (multiTree.getContainer().equals(container_3.getIdentifier()) && multiTree.getRelationType().equals("1")) {
+                assertEquals(contentlet_4.getIdentifier(), multiTree.getContentlet());
+            } else {
+                throw new AssertionError("UUID not expected: Container " + multiTree.getContainer() + " UUID " + multiTree.getRelationType());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have 20 Page with 5 containers instances from 3 different containers,
+     * and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1, Container 1
+     * - Contentlet_2 : Add to the instance 1, Container 2
+     * - Contentlet_3 : Add to the instance 2, Container 2
+     * - Contentlet_4 : Add to the instance 1, Container 3
+     * - Contentlet_5 : Add to the instance 2, Container 1
+     *
+     * And you remove the instance 1 of COntainer 1
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Removed
+     * - Contentlet_2 : Add to the instance 1, Container 2
+     * - Contentlet_3 : Add to the instance 2, Container 2
+     * - Contentlet_4 : Add to the instance 1, Container 3
+     * - Contentlet_5 : Add to the instance 2, Container 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainersUpdateMultiTreesMultiPages() throws DotDataException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container_1, "1")
+                .withContainer(container_2, "1")
+                .withContainer(container_2, "2")
+                .withContainer(container_3, "1")
+                .withContainer(container_1, "2")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final int pagesNumber = 20;
+        final HTMLPageAsset[] pages = new HTMLPageAsset[pagesNumber];
+
+        for (int i = 0; i < pagesNumber; i++) {
+            pages[i] = new HTMLPageDataGen(host, template).nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(pages[i])
+                    .setContainer(container_1)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_1)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(pages[i])
+                    .setContainer(container_2)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_2)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(pages[i])
+                    .setContainer(container_2)
+                    .setInstanceID("2")
+                    .setContentlet(contentlet_3)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(pages[i])
+                    .setContainer(container_3)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_4)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(pages[i])
+                    .setContainer(container_1)
+                    .setInstanceID("2")
+                    .setContentlet(contentlet_5)
+                    .nextPersisted();
+        }
+
+        final List<String> pageIds = Arrays.stream(pages)
+                .map(page -> page.getIdentifier())
+                .sorted(String::compareTo)
+                .collect(Collectors.toList());
+
+        final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                .remove(container_1.getIdentifier(), "1")
+                .change(container_1.getIdentifier(), "2", "1")
+                .build();
+
+        APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, pageIds);
+
+
+        final String getMultiTreeQuery = "SELECT parent1,parent2,child,relation_type FROM multi_tree WHERE parent1 in (?" +
+                new String(new char[pageIds.size() - 1]).replace("\0", ", ?") + ") order by parent1";
+
+        final DotConnect dotConnect = new DotConnect().setSQL(getMultiTreeQuery);
+        pageIds.stream().forEach(pageId -> dotConnect.addParam(pageId));
+
+        final ArrayList<Map<String, Object>> multiTreeResult = dotConnect.loadResults();
+        int multiTreeCurrentIndex = 0;
+
+        for (int i = 0; i < pagesNumber; i++) {
+
+            final List<Map<String, Object>> multiTress = getMultiTreeByPageOrder(pageIds.get(i), multiTreeResult,
+                    multiTreeCurrentIndex);
+
+            multiTreeCurrentIndex += multiTress.size();
+
+            assertEquals(4, multiTress.size());
+
+            for (final Map<String, Object> multiTree : multiTress) {
+
+                if (multiTree.get("parent2").equals(container_1.getIdentifier()) && multiTree.get("relation_type").equals("1")) {
+                    assertEquals(contentlet_5.getIdentifier(), multiTree.get("child"));
+                } else if (multiTree.get("parent2").equals(container_2.getIdentifier()) && multiTree.get("relation_type").equals("1")) {
+                    assertEquals(contentlet_2.getIdentifier(), multiTree.get("child"));
+                } else if (multiTree.get("parent2").equals(container_2.getIdentifier()) && multiTree.get("relation_type").equals("2")) {
+                    assertEquals(contentlet_3.getIdentifier(), multiTree.get("child"));
+                } else if (multiTree.get("parent2").equals(container_3.getIdentifier()) && multiTree.get("relation_type").equals("1")) {
+                    assertEquals(contentlet_4.getIdentifier(), multiTree.get("child"));
+                } else {
+                    throw new AssertionError("UUID not expected: Container " + multiTree.get("parent2") + " UUID " + multiTree.get("relation_type"));
+                }
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have disabled the DELETE_ORPHANED_CONTENTS_FROM_CONTAINER flag, and You have a Page with 4 containers
+     * all of them are different instances of the same containers, and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 4
+     *
+     * And you remove the instance 1
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_1 : ORPHANED
+     * - Contentlet_2 : Add to the instance 1
+     * - Contentlet_3 : Add to the instance 2
+     * - Contentlet_5 : Add to the instance 2
+     * - Contentlet_4 : Add to the instance 3
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerUpdateMultiTreesWithOrphaned() throws DotDataException {
+
+        boolean deleteOrphanedContentsFromContainer = Config.getBooleanProperty("DELETE_ORPHANED_CONTENTS_FROM_CONTAINER", true);
+        MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(false);
+
+        try {
+            final Host host = new SiteDataGen().nextPersisted();
+            final Container container = new ContainerDataGen().nextPersisted();
+            final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+            final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+            final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container, "1")
+                    .withContainer(container, "2")
+                    .withContainer(container, "3")
+                    .withContainer(container, "4")
+                    .next();
+
+            final Template template = new TemplateDataGen()
+                    .drawed(true)
+                    .drawedBody(templateLayout)
+                    .nextPersisted();
+
+            final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+            createMultiTrees(page, container, contentlet_1, contentlet_2, contentlet_3, contentlet_4, contentlet_5);
+
+            final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                    .remove(container.getIdentifier(), "1")
+                    .change(container.getIdentifier(), "2", "1")
+                    .change(container.getIdentifier(), "3", "2")
+                    .change(container.getIdentifier(), "4", "3")
+                    .build();
+
+            APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, list(page.getIdentifier()));
+
+            final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+            assertEquals(5, multiTreesFromDB.size());
+
+            final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                    .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+            for (final String intanceId : groupedByInstanceId.keySet()) {
+                final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+                switch (intanceId) {
+                    case "-1":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                        break;
+                    case "1":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                        break;
+                    case "2":
+                        assertEquals(2, multiTrees.size());
+
+                        List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                                .collect(Collectors.toList());
+                        assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                        assertTrue(contentlets.contains(contentlet_5.getIdentifier()));
+                        break;
+                    case "3":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_4.getIdentifier(), multiTrees.get(0).getContentlet());
+                        break;
+                    default:
+                        throw new AssertionError("UUID not expected: " + intanceId);
+                }
+            }
+        } finally {
+            MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(deleteOrphanedContentsFromContainer);
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)}
+     * When: You have enabled the DELETE_ORPHANED_CONTENTS_FROM_CONTAINER flag, and You have a Page with 4 containers
+     * all of them are different instances of the same containers, and you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 4
+     *
+     * And you remove the instance 1
+     *
+     * Should: The Contentlets should finish as:
+     *
+     * - Contentlet_1 : ORPHANED
+     * - Contentlet_2 : Add to the instance 1
+     * - Contentlet_3 : Add to the instance 2
+     * - Contentlet_5 : Add to the instance 2
+     * - Contentlet_4 : Add to the instance 3
+     *
+     *  Also the page had a Contentlet_6 orphaned content
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerUpdateMultiTreesWhenAlreadyExistsOrphaned() throws DotDataException {
+
+        boolean deleteOrphanedContentsFromContainer = Config.getBooleanProperty("DELETE_ORPHANED_CONTENTS_FROM_CONTAINER", true);
+        MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(false);
+
+        try {
+            final Host host = new SiteDataGen().nextPersisted();
+            final Container container = new ContainerDataGen().nextPersisted();
+            final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+            final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+            final TemplateLayout templateLayout = new TemplateLayoutDataGen().withContainer(container, "1")
+                    .withContainer(container, "2")
+                    .withContainer(container, "3")
+                    .withContainer(container, "4")
+                    .next();
+
+            final Template template = new TemplateDataGen()
+                    .drawed(true)
+                    .drawedBody(templateLayout)
+                    .nextPersisted();
+
+            final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+            createMultiTrees(page, container, contentlet_1, contentlet_2, contentlet_3, contentlet_4, contentlet_5);
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container)
+                    .setInstanceID("-1")
+                    .setContentlet(contentlet_6)
+                    .nextPersisted();
+
+
+            final LayoutChanges layoutChanges = new LayoutChanges.Builder()
+                    .remove(container.getIdentifier(), "1")
+                    .change(container.getIdentifier(), "2", "1")
+                    .change(container.getIdentifier(), "3", "2")
+                    .change(container.getIdentifier(), "4", "3")
+                    .build();
+
+            APILocator.getMultiTreeAPI().updateMultiTrees(layoutChanges, list(page.getIdentifier()));
+
+            final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+            assertEquals(6, multiTreesFromDB.size());
+
+            final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                    .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+            for (final String intanceId : groupedByInstanceId.keySet()) {
+                final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+                switch (intanceId) {
+                    case "-1":
+                        assertEquals(2, multiTrees.size());
+
+                        List<String> contentlets_1 = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                                .collect(Collectors.toList());
+
+                        assertTrue(contentlets_1.contains(contentlet_1.getIdentifier()));
+                        assertTrue(contentlets_1.contains(contentlet_6.getIdentifier()));
+                        break;
+                    case "1":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                        break;
+                    case "2":
+                        assertEquals(2, multiTrees.size());
+
+                        List<String> contentlets_2 = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                                .collect(Collectors.toList());
+                        assertTrue(contentlets_2.contains(contentlet_3.getIdentifier()));
+                        assertTrue(contentlets_2.contains(contentlet_5.getIdentifier()));
+                        break;
+                    case "3":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_4.getIdentifier(), multiTrees.get(0).getContentlet());
+                        break;
+                    default:
+                        throw new AssertionError("UUID not expected: " + intanceId);
+                }
+            }
+        } finally {
+            MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(deleteOrphanedContentsFromContainer);
+        }
+    }
+}
\ No newline at end of file
diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/portlets/templates/business/TemplateAPITest.java b/dotCMS/src/integration-test/java/com/dotmarketing/portlets/templates/business/TemplateAPITest.java
index dd1bb6cf97ea..9579b9cf769c 100644
--- a/dotCMS/src/integration-test/java/com/dotmarketing/portlets/templates/business/TemplateAPITest.java
+++ b/dotCMS/src/integration-test/java/com/dotmarketing/portlets/templates/business/TemplateAPITest.java
@@ -9,18 +9,9 @@
 
 import com.dotcms.IntegrationTestBase;
 import com.dotcms.content.elasticsearch.ESQueryCache;
-import com.dotcms.datagen.ContainerDataGen;
-import com.dotcms.datagen.HTMLPageDataGen;
-import com.dotcms.datagen.LanguageDataGen;
-import com.dotcms.datagen.MultiTreeDataGen;
-import com.dotcms.datagen.SiteDataGen;
-import com.dotcms.datagen.TemplateAsFileDataGen;
-import com.dotcms.datagen.TemplateDataGen;
-import com.dotcms.datagen.TestDataUtils;
-import com.dotcms.datagen.TestUserUtils;
-import com.dotcms.datagen.ThemeDataGen;
-import com.dotcms.datagen.UserDataGen;
-import com.dotcms.datagen.VariantDataGen;
+import com.dotcms.contenttype.model.type.ContentType;
+import com.dotcms.datagen.*;
+import com.dotcms.rendering.velocity.viewtools.DotTemplateTool;
 import com.dotcms.util.IntegrationTestInitService;
 import com.dotcms.variant.VariantAPI;
 import com.dotcms.variant.model.Variant;
@@ -39,6 +30,7 @@
 import com.dotmarketing.business.VersionableAPI;
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.exception.DotSecurityException;
+import com.dotmarketing.factories.MultiTreeAPIImpl;
 import com.dotmarketing.portlets.AssetUtil;
 import com.dotmarketing.portlets.containers.business.ContainerAPI;
 import com.dotmarketing.portlets.containers.model.Container;
@@ -51,20 +43,20 @@
 import com.dotmarketing.portlets.languagesmanager.model.Language;
 import com.dotmarketing.portlets.structure.model.Structure;
 import com.dotmarketing.portlets.templates.business.TemplateFactory.HTMLPageVersion;
-import com.dotmarketing.portlets.templates.design.bean.ContainerUUID;
+import com.dotmarketing.portlets.templates.design.bean.*;
 import com.dotmarketing.portlets.templates.model.FileAssetTemplate;
 import com.dotmarketing.portlets.templates.model.Template;
-import com.dotmarketing.util.Constants;
-import com.dotmarketing.util.Logger;
-import com.dotmarketing.util.UUIDGenerator;
-import com.dotmarketing.util.UtilMethods;
+import com.dotmarketing.util.*;
 import com.liferay.portal.model.User;
+
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+
 import org.awaitility.Awaitility;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -86,7 +78,7 @@ public class TemplateAPITest extends IntegrationTestBase {
 
     @BeforeClass
     public static void prepare () throws Exception {
-    	
+
         //Setting web app environment
         IntegrationTestInitService.getInstance().init();
 
@@ -103,12 +95,12 @@ public static void prepare () throws Exception {
     public void getContainersUUIDFromDrawTemplateBodyTest() throws Exception {
 
         final String templateBody = "  This is just test<br/>  \n" +
-                                    "  #parseContainer   ('f4a02846-7ca4-4e08-bf07-a61366bbacbb','1552493847863')  \n" +
-                                    "  <p>This is just test</p>  \n" +
-                                    "  #parseContainer   ('/application/containers/test1/','1552493847864')  \n" +
-                                    "#parseContainer('/application/containers/test2/','1552493847868')\n" +
-                                    "#parseContainer('/application/containers/test3/'     ,'1552493847869'       )\n" +
-                                    "#parseContainer(    '/application/containers/test4/',    '1552493847870')\n";
+                "  #parseContainer   ('f4a02846-7ca4-4e08-bf07-a61366bbacbb','1552493847863')  \n" +
+                "  <p>This is just test</p>  \n" +
+                "  #parseContainer   ('/application/containers/test1/','1552493847864')  \n" +
+                "#parseContainer('/application/containers/test2/','1552493847868')\n" +
+                "#parseContainer('/application/containers/test3/'     ,'1552493847869'       )\n" +
+                "#parseContainer(    '/application/containers/test4/',    '1552493847870')\n";
 
         final TemplateAPI templateAPI = APILocator.getTemplateAPI();
         final List<ContainerUUID> containerUUIDS = templateAPI.getContainersUUIDFromDrawTemplateBody(templateBody);
@@ -616,7 +608,7 @@ public void testFindLiveTemplateNoNPE() throws DotDataException, DotSecurityExce
                     APILocator.getUserAPI().getSystemUser(), false);
 
             assertNull(template);
-            
+
         }
         catch(NullPointerException e) {
             Logger.error(this, "getting non-existent template should not throw an NPE", e);
@@ -738,7 +730,7 @@ public void testFindTemplatesNoLayout () throws Exception {
 
             //This method should only return Templates, no Layouts
             List<Template> templates = APILocator.getTemplateAPI().findTemplates(user, false, null, null, null,
-                                                        null, null, 0, 1000, null);
+                    null, null, 0, 1000, null);
 
             assertFalse(templates.isEmpty());
             for (final Template temp : this.removeSystemTemplate(templates)) {
@@ -747,7 +739,7 @@ public void testFindTemplatesNoLayout () throws Exception {
 
             //This method should only return Templates, no Layouts
             templates = templateAPI.findTemplatesUserCanUse(user, null, null, false,
-                                                        0, 1000);
+                    0, 1000);
 
             assertFalse(templates.isEmpty());
             for (final Template temp : this.removeSystemTemplate(templates)) {
@@ -846,8 +838,8 @@ public void test_find_success() throws Exception{
      */
     @Test
     public void test_find_inode_not_exist_return_Null() throws Exception{
-       final Template templateFound = templateAPI.find(UUIDGenerator.generateUuid(),user,false);
-       assertNull(templateFound);
+        final Template templateFound = templateAPI.find(UUIDGenerator.generateUuid(),user,false);
+        assertNull(templateFound);
     }
 
     /**
@@ -1426,7 +1418,7 @@ private HTMLPageAsset getFromDataBase(final String inode) {
     }
 
     private HTMLPageAsset createNewVersion(final Language language, final HTMLPageAsset htmlPageAsset,
-            final Template template) {
+                                           final Template template) {
 
         final Contentlet checkout = HTMLPageDataGen.checkout(htmlPageAsset);
 
@@ -1439,7 +1431,7 @@ private HTMLPageAsset createNewVersion(final Language language, final HTMLPageAs
     }
 
     private HTMLPageAsset createNewVersion(final Variant variant, final HTMLPageAsset htmlPageAsset,
-            final Template template) {
+                                           final Template template) {
 
         final Contentlet checkout = HTMLPageDataGen.checkout(htmlPageAsset);
 
@@ -1450,4 +1442,3822 @@ private HTMLPageAsset createNewVersion(final Variant variant, final HTMLPageAsse
         return APILocator.getHTMLPageAssetAPI()
                 .fromContentlet(checking);
     }
-}
+
+    /**
+     * Method to test: {@link TemplateAPIImpl#saveAndUpdateLayout(Template, TemplateLayout, Host, User, boolean)}
+     * When: Save a Template with and not changing the Layout
+     * Should: Save the Template
+     *
+     * @throws DotDataException
+     * @throws DotSecurityException
+     */
+    @Test
+    public void updateLayout() throws DotDataException, DotSecurityException, IOException {
+        final Host defaultHost = APILocator.getHostAPI().findDefaultHost(APILocator.systemUser(), false);
+        final Template template = new TemplateDataGen().drawed(true).nextPersisted();
+        final TemplateLayout oldTemplateLayout = DotTemplateTool.getTemplateLayout(template.getDrawedBody());
+
+        APILocator.getTemplateAPI().saveAndUpdateLayout(template, oldTemplateLayout, defaultHost, APILocator.systemUser(),
+                false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(template.getInode(), APILocator.systemUser(),
+                false);
+
+        assertEquals(template, templateFromDB);
+
+        TemplateLayout templateLayout = DotTemplateTool.getTemplateLayout(template.getDrawedBody());
+
+        List<TemplateLayoutRow> rows = templateLayout.getBody().getRows();
+        assertEquals(1, rows.size());
+
+        List<TemplateLayoutColumn> columns = rows.get(0).getColumns();
+
+        assertEquals(1, columns.size());
+        assertEquals(new Integer(12), columns.get(0).getWidth());
+        assertTrue(columns.get(0).getContainers().isEmpty());
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 4 containers all of them are different instances and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 3, column 1:  instance 4 of the Container
+     *
+     * Also you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * And you move the last row to be the first
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 2
+     * - Contentlet_2 : Add to the instance 3
+     * - Contentlet_3 : Add to the instance 4
+     * - Contentlet_4 : Add to the instance 4
+     * - Contentlet_5 : Add to the instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveContainerUpdateMultiTrees() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("2")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("4")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout expectedTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "2")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addColumn(50)
+                .withContainer(container, "4")
+                .next();
+
+        assertEquals(expectedTemplateLayout, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_5.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "2":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "3":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "4":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_4.getIdentifier()));
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 4 containers all of them are different instances and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 3, column 1:  instance 4 of the Container
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * And you swap the two instance of the second row
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 3
+     * - Contentlet_3 : Add to the instance 2
+     * - Contentlet_4 : Add to the instance 2
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveContainerOnTheSameRowUpdateMultiTrees() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("2")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("4")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "2":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_4.getIdentifier()));
+                    break;
+                case "3":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "4":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_5.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 4 containers all of them are different instances and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 3, column 1:  instance 4 of the Container
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * And you remove the second row also you have  DELETE_ORPHANED_CONTENTS_FROM_CONTAINER flag disabled
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Removed
+     * - Contentlet_3 : Removed
+     * - Contentlet_4 : Removed
+     * - Contentlet_5 : Add to the instance 2
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerWithOrphanedDisabled() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("2")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("4")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "2")
+                .next();
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(2, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "2":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_5.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 4 containers all of them are different instances and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 3, column 1:  instance 4 of the Container
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * And you remove the second row also you have  DELETE_ORPHANED_CONTENTS_FROM_CONTAINER flag disabled
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : ORPHANED
+     * - Contentlet_3 : ORPHANED
+     * - Contentlet_4 : ORPHANED
+     * - Contentlet_5 : Add to the instance 2
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerWithOrphanedEnabled() throws DotDataException, DotSecurityException {
+        boolean deleteOrphanedContentsFromContainer = Config.getBooleanProperty("DELETE_ORPHANED_CONTENTS_FROM_CONTAINER", true);
+        MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(false);
+
+        try {
+            final Host host = new SiteDataGen().nextPersisted();
+            final Container container = new ContainerDataGen().nextPersisted();
+            final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+            final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+            final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container, "1")
+                    .addRow()
+                    .addColumn(50)
+                    .withContainer(container, "2")
+                    .addColumn(50)
+                    .withContainer(container, "3")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container, "4")
+                    .next();
+
+            final Template template = new TemplateDataGen()
+                    .drawed(true)
+                    .drawedBody(templateLayout)
+                    .nextPersisted();
+
+            final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_1)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container)
+                    .setInstanceID("2")
+                    .setContentlet(contentlet_2)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container)
+                    .setInstanceID("3")
+                    .setContentlet(contentlet_3)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container)
+                    .setInstanceID("3")
+                    .setContentlet(contentlet_4)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container)
+                    .setInstanceID("4")
+                    .setContentlet(contentlet_5)
+                    .nextPersisted();
+
+
+            final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container, "1")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container, "4")
+                    .next();
+
+            final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                    host, APILocator.systemUser(), false);
+
+            final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                    false);
+
+            final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+            final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container, "1")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container, "2")
+                    .next();
+
+            assertEquals(templateLayoutExpected, templateLayoutFromDB);
+            final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+            assertEquals(5, multiTreesFromDB.size());
+
+            final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                    .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+            for (final String intanceId : groupedByInstanceId.keySet()) {
+                final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+                switch (intanceId){
+                    case "1":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                        break;
+                    case "2":
+                        assertEquals(1, multiTrees.size());
+                        assertEquals(contentlet_5.getIdentifier(), multiTrees.get(0).getContentlet());
+                        break;
+                    case "-1":
+                        assertEquals(3, multiTrees.size());
+
+                        List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                                .collect(Collectors.toList());
+                        assertTrue(contentlets.contains(contentlet_2.getIdentifier()));
+                        assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                        assertTrue(contentlets.contains(contentlet_4.getIdentifier()));
+                        break;
+                    default:
+                        throw new AssertionError("UUID not expected: " + intanceId);
+                }
+            }
+        } finally {
+            MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(deleteOrphanedContentsFromContainer);
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 4 containers all of them are different instances and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 3, column 1:  instance 4 of the Container
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * And you added a new row on the top
+     *
+     * Should: The Layout should be
+     *
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 3, column 1:  instance 3 of the Container
+     * - Row 3, column 2:  instance 4 of the Container
+     * - Row 4, column 1:  instance 5 of the Container
+     *
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 2
+     * - Contentlet_2 : Add to the instance 3
+     * - Contentlet_3 : Add to the instance 4
+     * - Contentlet_4 : Add to the instance 4
+     * - Contentlet_5 : Add to the instance 5
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void addContainerOnTheLayout() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("2")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("4")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "-1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout newTemplateExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "2")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addColumn(50)
+                .withContainer(container, "4")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "5")
+                .next();
+
+        assertEquals(newTemplateExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    throw new AssertionError("UUID not expected: " + intanceId);
+                case "2":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "3":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "4":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_4.getIdentifier()));
+                    break;
+                case "5":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_5.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 4 containers all of them are different instances and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 3, column 1:  instance 4 of the Container
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * And you added a new container in the middle of the second row
+     *
+     * Should: The Layout should be
+     *
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 2, column 3:  instance 4 of the Container
+     * - Row 3, column 1:  instance 5 of the Container
+     *
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 4
+     * - Contentlet_4 : Add to the instance 4
+     * - Contentlet_5 : Add to the instance 5
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void addContainerInTheMiddleOnTheLayout() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("2")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("4")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(33)
+                .withContainer(container, "2")
+                .addColumn(33)
+                .withContainer(container, "-1")
+                .addColumn(33)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(33)
+                .withContainer(container, "2")
+                .addColumn(33)
+                .withContainer(container, "3")
+                .addColumn(33)
+                .withContainer(container, "4")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "5")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "2":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "3":
+                    throw new AssertionError("UUID not expected: " + intanceId);
+                case "4":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_4.getIdentifier()));
+                    break;
+                case "5":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_5.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 4 containers all of them are different instances and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 3, column 1:  instance 4 of the Container
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * And you added a new row just after the first one
+     *
+     * Should: The Layout should be
+     *
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container (New Row)
+     * - Row 3, column 1:  instance 3 of the Container
+     * - Row 3, column 2:  instance 4 of the Container
+     * - Row 4, column 1:  instance 5 of the Container
+     *
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 3
+     * - Contentlet_3 : Add to the instance 4
+     * - Contentlet_4 : Add to the instance 4
+     * - Contentlet_5 : Add to the instance 5
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void addRowInTheMiddleOnTheLayout() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("2")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("4")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "-1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "2")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addColumn(50)
+                .withContainer(container, "4")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "5")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "2":
+                    throw new AssertionError("UUID not expected: " + intanceId);
+                case "3":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "4":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_4.getIdentifier()));
+                    break;
+                case "5":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_5.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 4 containers all of them are different instances and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 3, column 1:  instance 4 of the Container
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * And you added Multiples rows
+     *
+     * Should: The Layout should be
+     *
+     * - Row 1, column 1:  instance 1 of the Container (New Row)
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 3, column 1:  instance 3 of the Container (New Row)
+     * - Row 4, column 1:  instance 4 of the Container
+     * - Row 4, column 2:  instance 5 of the Container
+     * - Row 5, column 1:  instance 6 of the Container (New Row)
+     * - Row 6, column 1:  instance 7 of the Container
+     * - Row 7, column 1:  instance 8 of the Container (New Row)
+     *
+     * - Contentlet_1 : Add to the instance 2
+     * - Contentlet_2 : Add to the instance 4
+     * - Contentlet_3 : Add to the instance 5
+     * - Contentlet_4 : Add to the instance 5
+     * - Contentlet_5 : Add to the instance 7
+     *
+     Change access modifier
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void addMultiplesContainersAddOnce() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("2")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("4")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "-1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "-1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "-1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "-1")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "4")
+                .addColumn(50)
+                .withContainer(container, "5")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "6")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "7")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "8")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "2":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "4":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "5":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_4.getIdentifier()));
+                    break;
+                case "7":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_5.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 4 containers all of them are different instances from the same Container
+     * and the follow layout:
+     *
+     * - Row 1, column 1:  instance 1 of the Container
+     * - Row 2, column 1:  instance 2 of the Container
+     * - Row 2, column 2:  instance 3 of the Container
+     * - Row 3, column 1:  instance 4 of the Container
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the instance 1
+     * - Contentlet_2 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_5 : Add to the instance 4
+     *
+     * And you move the last row to the top and also switch intances 2 and 3
+     *
+     * Should: The Layout should be
+     *
+     * - Row 1, column 1:  instance 4 of the Container
+     * - Row 2, column 1:  instance 1 of the Container
+     * - Row 3, column 1:  instance 3 of the Container
+     * - Row 3, column 2:  instance 2 of the Container
+     *
+     * - Contentlet_5 : Add to the instance 1
+     * - Contentlet_1 : Add to the instance 2
+     * - Contentlet_3 : Add to the instance 3
+     * - Contentlet_4 : Add to the instance 3
+     * - Contentlet_2 : Add to the instance 4
+
+     *
+     * Change access modifier
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveMultiplesContainersAddOnce() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container = new ContainerDataGen().nextPersisted();
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "2")
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("2")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("3")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container)
+                .setInstanceID("4")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "4")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addColumn(50)
+                .withContainer(container, "2")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container, "2")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container, "3")
+                .addColumn(50)
+                .withContainer(container, "4")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        final Map<String, List<MultiTree>> groupedByInstanceId = multiTreesFromDB.stream()
+                .collect(Collectors.groupingBy(MultiTree::getRelationType));
+
+        for (final String intanceId : groupedByInstanceId.keySet()) {
+            final List<MultiTree> multiTrees = groupedByInstanceId.get(intanceId);
+
+            switch (intanceId){
+                case "1":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_5.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "2":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_1.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+                case "3":
+                    assertEquals(2, multiTrees.size());
+
+                    List<String> contentlets = multiTrees.stream().map(multiTree -> multiTree.getContentlet())
+                            .collect(Collectors.toList());
+                    assertTrue(contentlets.contains(contentlet_3.getIdentifier()));
+                    assertTrue(contentlets.contains(contentlet_4.getIdentifier()));
+                    break;
+                case "4":
+                    assertEquals(1, multiTrees.size());
+                    assertEquals(contentlet_2.getIdentifier(), multiTrees.get(0).getContentlet());
+                    break;
+
+                default:
+                    throw new AssertionError("UUID not expected: " + intanceId);
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you move the Row 3 row to be the first
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_5 : Add to the Container 2 instance 1
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 2
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveContainerInMultiContainersLayout() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "2")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(6, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_3.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_4.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you move the last row to be the first
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveContainerInMultiContainersLayoutNotUUIDChanges() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(6, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_3.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_4.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you remove first row
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : removed
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 1
+     * - Contentlet_4 : Add to the Container 1 instance 1
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerInMultiContainersLayoutWithOrphanedDisabled() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout =new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected =new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_3.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_4.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you remove last row
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : removed
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerInMultiContainersLayoutWithOrphanedDisabledNotUUIDChanges() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(5, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_3.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_4.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you remove first row also you have  DELETE_ORPHANED_CONTENTS_FROM_CONTAINER flag disabled
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : ORPHANED
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 1
+     * - Contentlet_4 : Add to the Container 1 instance 1
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerInMultiContainersLayoutWithOrphanedEnabled() throws DotDataException, DotSecurityException {
+        boolean deleteOrphanedContentsFromContainer = Config.getBooleanProperty("DELETE_ORPHANED_CONTENTS_FROM_CONTAINER", true);
+        MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(false);
+
+        try {
+            final Host host = new SiteDataGen().nextPersisted();
+            final Container container_1 = new ContainerDataGen().nextPersisted();
+            final Container container_2 = new ContainerDataGen().nextPersisted();
+            final Container container_3 = new ContainerDataGen().nextPersisted();
+
+            final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+            final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+            final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_1, "1")
+                    .addRow()
+                    .addColumn(50)
+                    .withContainer(container_2, "1")
+                    .addColumn(50)
+                    .withContainer(container_1, "2")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_2, "2")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_3, "1")
+                    .next();
+
+            final Template template = new TemplateDataGen()
+                    .drawed(true)
+                    .drawedBody(templateLayout)
+                    .nextPersisted();
+
+            final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_1)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_1)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_2)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_2)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_1)
+                    .setInstanceID("2")
+                    .setContentlet(contentlet_3)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_1)
+                    .setInstanceID("2")
+                    .setContentlet(contentlet_4)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_2)
+                    .setInstanceID("2")
+                    .setContentlet(contentlet_5)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_3)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_6)
+                    .nextPersisted();
+
+
+            final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                    .addRow()
+                    .addColumn(50)
+                    .withContainer(container_2, "1")
+                    .addColumn(50)
+                    .withContainer(container_1, "2")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_2, "2")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_3, "1")
+                    .next();
+
+            final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                    host, APILocator.systemUser(), false);
+
+            final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                    false);
+
+            final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+            final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                    .addRow()
+                    .addColumn(50)
+                    .withContainer(container_2, "1")
+                    .addColumn(50)
+                    .withContainer(container_1, "1")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_2, "2")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_3, "1")
+                    .next();
+
+            assertEquals(templateLayoutExpected, templateLayoutFromDB);
+            final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+            assertEquals(6, multiTreesFromDB.size());
+
+            for (final MultiTree multiTree : multiTreesFromDB) {
+                if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                    assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                    assertEquals("-1", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                    assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                    assertEquals("1", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_3.getIdentifier())) {
+                    assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                    assertEquals("1", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_4.getIdentifier())) {
+                    assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                    assertEquals("1", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                    assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                    assertEquals("2", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                    assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                    assertEquals("1", multiTree.getRelationType());
+                } else {
+                    throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+                }
+            }
+        } finally {
+            MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(deleteOrphanedContentsFromContainer);
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you remove last row also you have  DELETE_ORPHANED_CONTENTS_FROM_CONTAINER flag disabled
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : ORPHANED
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeContainerInMultiContainersLayoutWithOrphanedEnabledNotUUIDChanges() throws DotDataException, DotSecurityException {
+        boolean deleteOrphanedContentsFromContainer = Config.getBooleanProperty("DELETE_ORPHANED_CONTENTS_FROM_CONTAINER", true);
+        MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(false);
+
+        try {
+            final Host host = new SiteDataGen().nextPersisted();
+            final Container container_1 = new ContainerDataGen().nextPersisted();
+            final Container container_2 = new ContainerDataGen().nextPersisted();
+            final Container container_3 = new ContainerDataGen().nextPersisted();
+
+            final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+            final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+            final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+            final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_1, "1")
+                    .addRow()
+                    .addColumn(50)
+                    .withContainer(container_2, "1")
+                    .addColumn(50)
+                    .withContainer(container_1, "2")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_2, "2")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_3, "1")
+                    .next();
+
+            final Template template = new TemplateDataGen()
+                    .drawed(true)
+                    .drawedBody(templateLayout)
+                    .nextPersisted();
+
+            final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_1)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_1)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_2)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_2)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_1)
+                    .setInstanceID("2")
+                    .setContentlet(contentlet_3)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_1)
+                    .setInstanceID("2")
+                    .setContentlet(contentlet_4)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_2)
+                    .setInstanceID("2")
+                    .setContentlet(contentlet_5)
+                    .nextPersisted();
+
+            new MultiTreeDataGen()
+                    .setPage(page)
+                    .setContainer(container_3)
+                    .setInstanceID("1")
+                    .setContentlet(contentlet_6)
+                    .nextPersisted();
+
+
+            final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_1, "1")
+                    .addRow()
+                    .addColumn(50)
+                    .withContainer(container_2, "1")
+                    .addColumn(50)
+                    .withContainer(container_1, "2")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_2, "2")
+                    .next();
+
+            final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                    host, APILocator.systemUser(), false);
+
+            final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                    false);
+
+            final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+            final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_1, "1")
+                    .addRow()
+                    .addColumn(50)
+                    .withContainer(container_2, "1")
+                    .addColumn(50)
+                    .withContainer(container_1, "2")
+                    .addRow()
+                    .addColumn(100)
+                    .withContainer(container_2, "2")
+                    .next();
+
+            assertEquals(templateLayoutExpected, templateLayoutFromDB);
+            final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+            assertEquals(6, multiTreesFromDB.size());
+
+            for (final MultiTree multiTree : multiTreesFromDB) {
+                if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                    assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                    assertEquals("1", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                    assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                    assertEquals("1", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_3.getIdentifier())) {
+                    assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                    assertEquals("2", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_4.getIdentifier())) {
+                    assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                    assertEquals("2", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                    assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                    assertEquals("2", multiTree.getRelationType());
+                } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                    assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                    assertEquals("-1", multiTree.getRelationType());
+                } else {
+                    throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+                }
+            }
+        } finally {
+            MultiTreeAPIImpl.setDeleteOrphanedContentsFromContainer(deleteOrphanedContentsFromContainer);
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you Add a row after the first row with container_1
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 3
+     * - Contentlet_4 : Add to the Container 1 instance 3
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void addContainerInMultiContainersLayout() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "-1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(6, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_3.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("3", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_4.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("3", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you Add a row after the last one
+     *
+     * Should: The Layout should finish on the same way:
+     * The Contentlets should finish the same as the were before the change
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void addContainerInMultiContainersLayoutNotUUIDChanges() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "-1")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "3")
+                .next();
+
+        assertEquals(newTemplateLayout, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(6, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_3.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_4.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you move the third row to be the first and add a new third row with a instance of the Container 1
+     *
+     * Should: The Layout should finish as:
+     *
+     * - Row 1, column 1:  instance 1 of the Container 2
+     * - Row 2, column 1:  instance 1 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 1
+     * - Row 4, column 1:  instance 2 of the Container 2
+     * - Row 4, column 2:  instance 3 of the Container 1
+     * - Row 5, column 1:  instance 1 of the Container 3
+     *
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_5 : Add to the Container 2 instance 1
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 2
+     * - Contentlet_3 : Add to the Container 1 instance 3
+     * - Contentlet_4 : Add to the Container 1 instance 3
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void moveAndAddContainerInMultiContainersLayout() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "-1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "2")
+                .addColumn(50)
+                .withContainer(container_1, "3")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        assertEquals(newTemplateLayout, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(6, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_3.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("3", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_4.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("3", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you remove the second row add a new first row with a instance of the Container 1
+     *
+     * Should: The Layout should finish as:
+     *
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 1 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the Container 1 instance 2
+     * - Contentlet_2 : Removed
+     * - Contentlet_3 : Removed
+     * - Contentlet_4 : Removed
+     * - Contentlet_5 : Add to the Container 2 instance 1
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeAndAddContainerInMultiContainersLayout() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "-1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(3, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you remove the second column in the second row and move the third row to the top
+     *
+     * Should: The Layout should finish as:
+     *
+     * - Row 1, column 1:  instance 1 of the Container 2
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_5 : Add to the Container 2 instance 1
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 2
+     * - Contentlet_3 : Removed
+     * - Contentlet_4 : Removed
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeAndMoveContainerInMultiContainersLayout() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(4, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+
+    /**
+     * Method to test: {@link MultiTreeAPIImpl#updateMultiTrees(String, LayoutChanges)}
+     * When: You have a Page with 5 containers instances from 3 different Containers  and the follow layout:
+     * - Row 1, column 1:  instance 1 of the Container 1
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 2, column 2:  instance 2 of the Container 1
+     * - Row 3, column 1:  instance 2 of the Container 2
+     * - Row 4, column 1:  instance 1 of the Container 3
+     *
+     * Also, you have 5 Contentlets add as follows:
+     * - Contentlet_1 : Add to the Container 1 instance 1
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Add to the Container 1 instance 2
+     * - Contentlet_4 : Add to the Container 1 instance 2
+     * - Contentlet_5 : Add to the Container 2 instance 2
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * And you remove the second column in the second row and move the third row to the top, and add a new row on the top
+     *
+     * Should: The Layout should finish as
+     * :
+     * - Row 1, column 1:  instance 1 of the Container 1 (New one)
+     * - Row 2, column 1:  instance 1 of the Container 2
+     * - Row 3, column 1:  instance 2 of the Container 1
+     * - Row 4, column 1:  instance 2 of the Container 2
+     * - Row 5, column 1:  instance 1 of the Container 3
+     *
+     * The Contentlets should finish as:
+     *
+     * - Contentlet_1 : Add to the Container 1 instance 2
+     * - Contentlet_2 : Add to the Container 2 instance 1
+     * - Contentlet_3 : Removed
+     * - Contentlet_4 : Removed
+     * - Contentlet_5 : Add to the Container 2 instance 1
+     * - Contentlet_6 : Add to the Container 3 instance 1
+     *
+     * @throws DotDataException
+     */
+    @Test
+    public void removeMoveAndAddContainerInMultiContainersLayout() throws DotDataException, DotSecurityException {
+        final Host host = new SiteDataGen().nextPersisted();
+        final Container container_1 = new ContainerDataGen().nextPersisted();
+        final Container container_2 = new ContainerDataGen().nextPersisted();
+        final Container container_3 = new ContainerDataGen().nextPersisted();
+
+        final ContentType contentType = new ContentTypeDataGen().nextPersisted();
+        final Contentlet contentlet_1 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_2 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_3 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_4 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_5 = new ContentletDataGen(contentType).nextPersisted();
+        final Contentlet contentlet_6 = new ContentletDataGen(contentType).nextPersisted();
+
+        final TemplateLayout templateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(50)
+                .withContainer(container_2, "1")
+                .addColumn(50)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template template = new TemplateDataGen()
+                .drawed(true)
+                .drawedBody(templateLayout)
+                .nextPersisted();
+
+        final HTMLPageAsset page = new HTMLPageDataGen(host, template).nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("1")
+                .setContentlet(contentlet_1)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("1")
+                .setContentlet(contentlet_2)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_3)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_1)
+                .setInstanceID("2")
+                .setContentlet(contentlet_4)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_2)
+                .setInstanceID("2")
+                .setContentlet(contentlet_5)
+                .nextPersisted();
+
+        new MultiTreeDataGen()
+                .setPage(page)
+                .setContainer(container_3)
+                .setInstanceID("1")
+                .setContentlet(contentlet_6)
+                .nextPersisted();
+
+
+        final TemplateLayout newTemplateLayout = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "-1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        final Template templateSaved = APILocator.getTemplateAPI().saveAndUpdateLayout(template, newTemplateLayout,
+                host, APILocator.systemUser(), false);
+
+        final Template templateFromDB = APILocator.getTemplateAPI().find(templateSaved.getInode(), APILocator.systemUser(),
+                false);
+
+        final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+        final TemplateLayout templateLayoutExpected = new TemplateLayoutDataGen()
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "1")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_1, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_2, "2")
+                .addRow()
+                .addColumn(100)
+                .withContainer(container_3, "1")
+                .next();
+
+        assertEquals(templateLayoutExpected, templateLayoutFromDB);
+        final List<MultiTree> multiTreesFromDB = APILocator.getMultiTreeAPI().getMultiTrees(page.getIdentifier());
+        assertEquals(4, multiTreesFromDB.size());
+
+        for (final MultiTree multiTree : multiTreesFromDB) {
+            if (multiTree.getContentlet().equals(contentlet_1.getIdentifier())) {
+                assertEquals(container_1.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_2.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("2", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_5.getIdentifier())) {
+                assertEquals(container_2.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else if (multiTree.getContentlet().equals(contentlet_6.getIdentifier())) {
+                assertEquals(container_3.getIdentifier(), multiTree.getContainer());
+                assertEquals("1", multiTree.getRelationType());
+            } else {
+                throw new AssertionError("Contententlet not expected: " + multiTree.getContentlet());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageForm.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageForm.java
index f2f0f721bb38..d935e5717ee9 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageForm.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageForm.java
@@ -35,18 +35,15 @@ class PageForm {
     private final String title;
     private final String siteId;
     private final TemplateLayout layout;
-    private final Map<String, ContainerUUIDChanged> changes;
-    private final Map<String, String> newlyContainersUUID;
 
-    public PageForm(final String themeId, final String title, final String siteId, final TemplateLayout layout,
-                    final Map<String, ContainerUUIDChanged> changes, final Map<String, String> newlyContainersUUID) {
+
+    public PageForm(final String themeId, final String title, final String siteId, final TemplateLayout layout) {
 
         this.themeId = themeId;
         this.title = title;
         this.siteId = siteId;
         this.layout = layout;
-        this.changes = ImmutableMap.<String, ContainerUUIDChanged> builder().putAll(changes).build();
-        this.newlyContainersUUID = ImmutableMap.copyOf(newlyContainersUUID);
+
     }
 
 
@@ -86,79 +83,9 @@ public TemplateLayout getLayout() {
         return layout;
     }
 
-    /**
-     * Allows you to determine whether the instance ID of a given Container has changed or not based
-     * on the modifications that are being persisted. This makes it easier for the API to be able to
-     * update the necessary instance IDs across the page's Template so that contents are displayed
-     * in the appropriate order.
-     *
-     * <p>For instance, if a Template has three instances of the Default Container -- "1", "2", and
-     * "3" -- and instance "2" is deleted, the change list will be:</p>
-     * <ul>
-     *     <li>Old Instance ID = "1" / New Instance ID = "1" -- The value remains.</li>
-     *     <li>Instance ID "2" is NOT present as it is the one that was removed from the Template
-     *     .</li>
-     *     <li>Old Instance ID = "3" / New Instance ID = "2" -- Because the second instance was
-     *     removed, the third Container now takes the second instance's ID.</li>
-     * </ul>
-     *
-     * @param identifier The ID of the Container, or its path in case it's a Container as File.
-     * @param uuid       The current instance ID of the Container.
-     *
-     * @return The {@link ContainerUUIDChanged} instance that contains the old and new instance IDs.
-     */
-    public ContainerUUIDChanged getChangeInContainerInstanceIDs(final String identifier, final String uuid) {
-        ContainerUUIDChanged containerUUIDChanged = this.changes.get(getChangeKey(identifier, uuid));
-
-        if (containerUUIDChanged == null) {
-            containerUUIDChanged = ContainerUUID.UUID_LEGACY_VALUE.equals(uuid) ?
-                    this.changes.get(getChangeKey(identifier, ContainerUUID.UUID_START_VALUE)) :
-                    this.changes.get(getChangeKey(identifier, ContainerUUID.UUID_LEGACY_VALUE));
-        }
-
-        return containerUUIDChanged;
-    }
-
-    /**
-     * Returns the instance ID of a Container that has just been added to the Template. That is, a
-     * Container that didn't exist and was added by this change in particular.
-     *
-     * @param identifier The ID or file path of the recently-added Container
-     *
-     * @return The instance ID of the recently-added Container.
-     */
-    public String getNewlyContainerUUID (String identifier) {
-        return this.newlyContainersUUID.get(identifier);
-    }
-
-    /**
-     * Generates the key that identifies the potential change in a Container instance ID.
-     *
-     * @param containerUUID The {@link ContainerUUID} object whose information may have changed..
-     *
-     * @return The key that identifies the potential change in a Container instance ID.
-     */
-    private static String getChangeKey(ContainerUUID containerUUID) {
-        return getChangeKey(containerUUID.getIdentifier(), containerUUID.getUUID());
-    }
-
-    /**
-     * Generates the key that identifies a potential change in a Container's instance ID.
-     *
-     * @param identifier The ID or file path to a given Container.
-     * @param uuid       The current instance ID of the Container.
-     *
-     * @return The key that identifies the potential change in a Container instance ID.
-     */
-    private static String getChangeKey(String identifier, String uuid) {
-        return String.format("%s - %s", identifier, uuid);
-    }
-
 
     public static final class Builder {
 
-        private static final ObjectMapper MAPPER = new ObjectMapper();
-
         @JsonProperty
         private String themeId;
 
@@ -169,7 +96,7 @@ public static final class Builder {
         private String hostId;
 
         @JsonProperty(required = true)
-        private Map<String, Object> layout;
+        private TemplateLayout layout;
 
         @JsonIgnore
         private Map<String, ContainerUUIDChanged> changes;
@@ -195,116 +122,13 @@ public Builder hostId(String hostId) {
             return this;
         }
 
-        public Builder layout(Map<String, Object> layout) {
+        public Builder layout(TemplateLayout layout) {
             this.layout = layout;
             return this;
         }
 
-        /**
-         * Transforms the Template's layout as a data Map into an instance of
-         * {@link TemplateLayout}.
-         *
-         * @return An instance of {@link TemplateLayout} that represents the Template's layout.
-         *
-         * @throws BadRequestException If the Template's layout is invalid or missing.
-         */
-        private TemplateLayout getTemplateLayout() throws BadRequestException {
-
-            if (layout == null) {
-                throw new BadRequestException("layout is required");
-            }
-
-            try {
-                this.setContainersUUID();
-                final String layoutString = MAPPER.writeValueAsString(layout);
-                return MAPPER.readValue(layoutString, TemplateLayout.class);
-            } catch (final IOException e) {
-                throw new BadRequestException(e, String.format("An error occurred when processing" +
-                        " the layout for Template '%s'", UtilMethods.isSet(title) ? title : "- " +
-                        "Anonymous Template -"));
-            }
-        }
-
-        private void setContainersUUID() {
-            changes = new HashMap<>();
-            newlyContainersUUID = new HashMap<>();
-
-            final Map<String, Long> maxUUIDByContainer = new HashMap<>();
-
-            final Map<String, Object> body = (Map<String, Object>) layout.get("body");
-
-            if (body == null) {
-                throw new BadRequestException("body attribute is required");
-            }
-
-            final List<Map<String, Map>> rows = (List<Map<String, Map>>) body.get("rows");
-
-            if (rows == null) {
-                throw new BadRequestException("body has to have at least one row");
-            }
-
-            getAllContainers().forEach(container -> setChange(maxUUIDByContainer, container));
-        }
-
-        /**
-         * Loads the data Maps of every Container in the Template's layout, with its previous and
-         * updated instance ID.
-         *
-         * @param maxInstanceIDByContainer Keeps track of the maximum instance ID that has been
-         *                                 assigned to a previously added Container of the same
-         *                                 type. It helps increase the instance ID one by one in
-         *                                 order.
-         * @param container                The current Container instance inside the Template.
-         */
-        private void setChange(final Map<String, Long> maxInstanceIDByContainer, final Map<String, String> container) {
-            try {
-                final String containerId = container.get("identifier");
-                final long currentInstanceID = maxInstanceIDByContainer.get(containerId) != null ?
-                        maxInstanceIDByContainer.get(containerId) : 0;
-                final long nextInstanceID = currentInstanceID + 1;
-
-                if (container.get("uuid") != null) {
-                    final ContainerUUID oldContainerInstanceID = MAPPER.readValue(MAPPER.writeValueAsString(container),
-                            ContainerUUID.class);
-                    container.put("uuid", String.valueOf(nextInstanceID));
-                    final ContainerUUID newContainerInstanceID = MAPPER.readValue(MAPPER.writeValueAsString(container),
-                            ContainerUUID.class);
-                    changes.put(getChangeKey(oldContainerInstanceID), new ContainerUUIDChanged(oldContainerInstanceID, newContainerInstanceID));
-                } else {
-                    container.put("uuid", String.valueOf(nextInstanceID));
-                    newlyContainersUUID.put(containerId, String.valueOf(nextInstanceID));
-                }
-
-                maxInstanceIDByContainer.put(containerId, nextInstanceID);
-            } catch (final IOException e) {
-                Logger.error(this.getClass(),String.format("Failed to map changed Container instance IDs in Template " +
-                                "'%s': %s", UtilMethods.isSet(title) ? title : "- Anonymous Template -",
-                        ExceptionUtil.getErrorMessage(e)), e);
-            }
-        }
-
-        private Stream<Map<String, String>> getAllContainers() {
-            final Stream<Map<String, String>> bodyContainers =
-                    ((List<Map<String, Map>>) ((Map<String, Object>) layout.get("body")).get("rows"))
-                            .stream()
-                            .map(row -> (List<Map<String, Map>>) row.get("columns"))
-                            .flatMap(columns -> columns.stream())
-                            .map(column -> (List<Map<String, String>>) column.get("containers"))
-                            .flatMap(containers -> containers.stream());
-
-            if (layout.get("sidebar") != null){
-                final Stream<Map<String, String>> sidebarContainers =
-                        ((List<Map<String, String>>) ((Map<String, Object>) layout.get("sidebar")).get("containers"))
-                                .stream();
-
-                return Stream.concat(sidebarContainers, bodyContainers);
-            } else {
-                return bodyContainers;
-            }
-        }
-
-        public PageForm build(){
-            return new PageForm(themeId, title, hostId, getTemplateLayout(), changes, newlyContainersUUID);
+        PageForm build(){
+            return new PageForm(themeId, title, hostId, layout);
         }
 
     }
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResource.java
index d8b5cab7e700..1d36cc2e664f 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResource.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResource.java
@@ -419,11 +419,6 @@ public Response saveLayout(@Context final HttpServletRequest request, @Context f
                     e.getClass().getCanonicalName(), request, form);
             Logger.error(this, errorMsg, e);
             res = ExceptionMapperUtil.createResponse(e, Response.Status.BAD_REQUEST);
-        } catch (IOException e) {
-            final String errorMsg = String.format("IOException on PageResource.saveLayout, parameters:  %s, %s: ",
-                    request, form);
-            Logger.error(this, errorMsg, e);
-            res = ExceptionMapperUtil.createResponse(e, Response.Status.INTERNAL_SERVER_ERROR);
         }
 
         return res;
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResourceHelper.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResourceHelper.java
index 5c04e03309b9..2af7e88b58ac 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResourceHelper.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResourceHelper.java
@@ -87,8 +87,6 @@
 public class PageResourceHelper implements Serializable {
 
     private static final long serialVersionUID = 296763857542258211L;
-    private static final Lazy<Boolean> DELETE_ORPHANED_CONTENTS_FROM_CONTAINER =
-            Lazy.of(() -> Config.getBooleanProperty("DELETE_ORPHANED_CONTENTS_FROM_CONTAINER", true));
 
     private final HostWebAPI hostWebAPI = WebAPILocator.getHostWebAPI();
     private final HTMLPageAssetAPI htmlPageAssetAPI = APILocator.getHTMLPageAssetAPI();
@@ -359,11 +357,10 @@ public Template saveTemplate(final IHTMLPage page, final User user, final PageFo
             }
 
             template.setDrawed(true);
-            updateMultiTrees(page, pageForm);
 
             template.setModDate(new Date());
             // permissions have been updated above
-            return this.templateAPI.saveTemplate(template, site, APILocator.systemUser(), false);
+            return this.templateAPI.saveAndUpdateLayout(template, pageForm.getLayout(), site, APILocator.systemUser(), false);
         } catch (final DotDataException | DotSecurityException e) {
             final String errorMsg = String.format("An error occurred when saving Template '%s' [ %s ]: %s",
                     template.getTitle(), template.getIdentifier(), ExceptionUtil.getErrorMessage(e));
@@ -371,109 +368,8 @@ public Template saveTemplate(final IHTMLPage page, final User user, final PageFo
         }
     }
 
-    @WrapInTransaction
-    protected void updateMultiTrees(final IHTMLPage page, final PageForm pageForm) throws DotDataException, DotSecurityException {
-
-        final String currentVariantId = WebAPILocator.getVariantWebAPI().currentVariantId();
-        final Table<String, String, Set<PersonalizedContentlet>> pageContents = multiTreeAPI
-                .getPageMultiTrees(page, currentVariantId, false);
-
-        final String pageIdentifier = page.getIdentifier();
-        APILocator.getMultiTreeAPI().deleteMultiTree(pageIdentifier, currentVariantId);
-
-        final List<MultiTree> multiTrees = new ArrayList<>();
-        final boolean deleteOrphanedContents = DELETE_ORPHANED_CONTENTS_FROM_CONTAINER.get();
-
-        for (final String containerId : pageContents.rowKeySet()) {
-            int treeOrder = 0;
-
-            for (final String uniqueId : pageContents.row(containerId).keySet()) {
-                final Map<String, Set<PersonalizedContentlet>> row = pageContents.row(containerId);
-                final Set<PersonalizedContentlet> contents         = row.get(uniqueId);
-
-                if (!contents.isEmpty()) {
-                    final String newContainerLayoutID = getNewContainerLayoutID(pageForm, containerId, uniqueId);
-                    // Adding multi-tre records is skipped if (1) deleting orphaned records is enabled
-                    // and (2) the container instance ID equals -1
-                    if (!deleteOrphanedContents || (!ContainerUUID.UUID_DEFAULT_VALUE.equals(newContainerLayoutID))) {
-                        for (final PersonalizedContentlet identifierPersonalization : contents) {
-                            final MultiTree multiTree = MultiTree.personalized(
-                                    new MultiTree().setContainer(containerId)
-                                            .setContentlet(identifierPersonalization.getContentletId())
-                                            .setInstanceId(newContainerLayoutID)
-                                            .setTreeOrder(treeOrder++)
-                                            .setHtmlPage(pageIdentifier)
-                                            .setVariantId(currentVariantId),
-                                    identifierPersonalization.getPersonalization());
-
-                            multiTrees.add(multiTree);
-                        }
-                    }
-                }
-            }
-        }
-
-        multiTreeAPI.saveMultiTrees(pageIdentifier, currentVariantId, multiTrees);
-    }
-
-    /**
-     * Returns the existing instance ID of the specified Container in the HTML Page Layout, or a new
-     * instance ID in case it was changed because one or more Containers before or after it were
-     * added, moved or removed.
-     *
-     * <p>The object {@link ContainerUUIDChanged} in the {@link PageForm} parameter indicates
-     * whether a Container's position was changed, or removed altogether. If that's the case, an
-     * instance ID of -1 will be returned. Containers whose instance ID start with
-     * {@link ParseContainer#PARSE_CONTAINER_UUID_PREFIX} will always keep its ID.</p>
-     *
-     * <p>Additionally, if the Container instance ID cannot be found in the internal Map that holds
-     * the updated position of Containers, it means such a Container doesn't exist anymore, so a -1
-     * will be returned.</p>
-     *
-     * @param pageForm    The {@link PageForm} object containing the Template's new layout
-     *                    information.
-     * @param containerId The ID of the Container being processed.
-     * @param uniqueId    The currently assigned instance ID of the Container
-     *
-     * @return The new instance ID of the Container, or -1 in case it was deleted from the Template.
-     *
-     * @throws DotDataException     An error occurred when persisting the changes.
-     * @throws DotSecurityException A user permission error has occurred.
-     */
-    private String getNewContainerLayoutID(final PageForm pageForm, final String containerId,
-                                           final String uniqueId)
-            throws DotDataException, DotSecurityException {
-
-        String containerPath = null;
-        final Container foundContainer = APILocator.getContainerAPI()
-                .getWorkingContainerById(containerId, userAPI.getSystemUser(), false);
-        if (foundContainer instanceof FileAssetContainer) {
-            // If we have a FileAssetContainer, we may need to search by path instead
-            containerPath = FileAssetContainerUtil.getInstance().getFullPath((FileAssetContainer) foundContainer);
-        }
-
-        if (ContainerUUID.UUID_DEFAULT_VALUE.equals(uniqueId)) {
-            String newContainerInstanceID = pageForm.getNewlyContainerUUID(containerId);
-            if (newContainerInstanceID == null && containerPath != null) {
-                // Searching also by Container path -- i.e., Container as File -- if not found
-                newContainerInstanceID = pageForm.getNewlyContainerUUID(containerPath);
-            }
-            return newContainerInstanceID != null ? newContainerInstanceID
-                    : ContainerUUID.UUID_DEFAULT_VALUE;
-        } if (ParseContainer.isParserContainerUUID(uniqueId)) {
-            return uniqueId;
-        } else {
-            ContainerUUIDChanged change = pageForm.getChangeInContainerInstanceIDs(containerId, uniqueId);
-            if (change == null && containerPath != null) {
-                // Searching also by Container path -- i.e., Container as File -- if not found
-                change = pageForm.getChangeInContainerInstanceIDs(containerPath, uniqueId);
-            }
-            return change != null ? change.getNewInfo().getUUID() : ContainerUUID.UUID_DEFAULT_VALUE;
-        }
-    }
-
     public Template saveTemplate(final User user, final PageForm pageForm)
-            throws BadRequestException, DotDataException, DotSecurityException, IOException {
+            throws BadRequestException, DotDataException, DotSecurityException {
         return this.saveTemplate(null, user, pageForm);
     }
 
@@ -495,7 +391,6 @@ private Template checkoutTemplate(final IHTMLPage page, final User user, final P
 
         saveTemplate.setInode(null);
         saveTemplate.setTheme((form.getThemeId()==null) ? oldTemplate.getTheme() : form.getThemeId());
-        saveTemplate.setDrawedBody(form.getLayout());
         saveTemplate.setDrawed(true);
         
         return saveTemplate;
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateLayoutView.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateLayoutView.java
index 262bb82fb8e1..aef7ee571f6f 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateLayoutView.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateLayoutView.java
@@ -61,135 +61,4 @@ public SidebarView getSidebar() {
         return sidebar;
     }
 
-    /**
-     * This method iterates over each container in the template and assign a UUID according the
-     * amount of times the container is present in the template.
-     * This is for the users can have 2 diff templates with diff design but the same containers
-     * so they can change the template without losing the content.
-     *
-     * TemplateLayoutView with the updated UUID for each container.
-     */
-    protected ContainerUUIDChanges updateUUIDOfContainers(){
-        final ContainerUUIDChanges containerUUIDChanged = new ContainerUUIDChanges();
-
-        final Map<String,Integer> UUIDByContainermap = new HashMap<>();
-
-        this.getBody().getRows().forEach(
-                row -> row.getColumns().stream().forEach(
-                        column -> column.getContainers().stream().forEach(
-                                containerUUID -> {
-                                    final String[] uuidValues = setNewUUID(UUIDByContainermap,
-                                            containerUUID);
-                                    containerUUIDChanged.change(containerUUID.getIdentifier(), uuidValues[0], uuidValues[1]);
-                                }
-                        )));
-
-        if(this.getSidebar() != null) {
-            this.getSidebar().getContainers().stream().forEach(
-                    containerUUID -> {
-                        final String[] uuidValues = setNewUUID(UUIDByContainermap, containerUUID);
-                        containerUUIDChanged.change(containerUUID.getIdentifier(), uuidValues[0], uuidValues[1]);
-                    }
-            );
-        }
-
-        return containerUUIDChanged;
-    }
-
-    private static String[] setNewUUID(final Map<String, Integer> UUIDByContainermap,
-            final ContainerUUID containerUUID) {
-        final String oldValue = containerUUID.getUUID();
-        final String containerID = containerUUID.getIdentifier();
-        int value = UUIDByContainermap.getOrDefault(containerID,0);
-        final int newValue = value + 1;
-        UUIDByContainermap.put(containerID, newValue);
-        containerUUID.setUuid(UUIDByContainermap.get(containerID).toString());
-
-        return new String[]{oldValue, String.valueOf(newValue)};
-    }
-
-
-    /**
-     * Represent a set of UUID change when a Template's Layout is updated
-     *
-     */
-    public static class ContainerUUIDChanges {
-        final Map<String, Map<String, String>> changes = new HashMap();
-        final Map<String, Collection<String>> newValues = new HashMap<>();
-        public void change(final String containerId, final String oldValue, final String newValue) {
-            if (ContainerUUID.UUID_DEFAULT_VALUE.equals(oldValue)) {
-                final Collection<String> containerNewValues = newValues.getOrDefault(containerId,
-                        new HashSet<>());
-                containerNewValues.add(newValue);
-                newValues.put(containerId, containerNewValues);
-            } else if (!oldValue.equals(newValue)) {
-                final Map<String, String> containerChanges = changes.getOrDefault(containerId,
-                        new HashMap<>());
-                containerChanges.put(oldValue, newValue);
-                changes.put(containerId, containerChanges);
-            }
-        }
-
-        /**
-         * Return all the UUID that was lost in the Template's Layout update, for Example, if
-         * we have a Template with a Layout equals to:
-         *
-         * <code>
-         * {
-         *     rows: [
-         *      columns: [
-         *          containers: [
-         *              {
-         *                  id: "...",
-         *                  uuid: "109839"
-         *              }
-         *          ]
-         *       ]
-         *     ]
-         * }
-         * </code>
-         *
-         *  The UUID equals to 109839 is not valid for this reason if the Layout is updated this UUID
-         *  is changed by 1, and then the 109839 is lost.
-         *
-         * @return
-         */
-        public Collection<ContainerUUIDChanged> lostUUIDValues(){
-            final List<ContainerUUIDChanged> result = new ArrayList<>();
-
-            for (final String containerId : changes.keySet()) {
-                final Map<String, String> containerChanges = changes.get(containerId);
-                final Collection<String> newValuesChanged = containerChanges.values();
-                final Collection<String> containerNewValues = newValues.get(containerId);
-
-                final List<ContainerUUIDChanged> partialResult = containerChanges.entrySet().stream()
-                        .filter(entry -> !newValuesChanged.contains(entry.getKey()))
-                        .filter(entry -> !UtilMethods.isSet(containerNewValues) || !containerNewValues.contains(entry.getKey()))
-                        .map(entry -> new ContainerUUIDChanged(containerId, entry.getKey(),
-                                entry.getValue()))
-                        .collect(Collectors.toList());
-
-                result.addAll(partialResult);
-            }
-
-            return result;
-        }
-    }
-
-    /**
-     * Represent a Change in just one UUID into the Template's Layout
-     */
-    public static class ContainerUUIDChanged {
-        final String containerId;
-        final String newValue;
-        final String oldValue;
-
-        public ContainerUUIDChanged(final String containerId, final String oldValue, final String newValue) {
-            this.newValue = newValue;
-            this.oldValue = oldValue;
-            this.containerId = containerId;
-        }
-
-
-    }
 }
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateResource.java
index 12e38871153d..9055504d51bb 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateResource.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateResource.java
@@ -7,8 +7,6 @@
 import com.dotcms.rest.annotation.NoCache;
 import com.dotcms.rest.api.BulkResultView;
 import com.dotcms.rest.api.FailedResultView;
-import com.dotcms.rest.api.v1.template.TemplateLayoutView.ContainerUUIDChanged;
-import com.dotcms.rest.api.v1.template.TemplateLayoutView.ContainerUUIDChanges;
 import com.dotcms.util.PaginationUtil;
 import com.dotcms.util.pagination.ContainerPaginator;
 import com.dotcms.util.pagination.OrderDirection;
@@ -24,6 +22,7 @@
 import com.dotmarketing.portlets.containers.business.ContainerAPI;
 import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.dotmarketing.portlets.templates.business.TemplateAPI;
+import com.dotmarketing.portlets.templates.design.bean.TemplateLayout;
 import com.dotmarketing.portlets.templates.design.util.DesignTemplateUtil;
 import com.dotmarketing.portlets.templates.model.Template;
 import com.dotmarketing.util.ActivityLogger;
@@ -70,6 +69,7 @@
 public class TemplateResource {
 
     private static final String ARCHIVE_PARAM = "archive";
+    public static final String USER = "User ";
     private final PaginationUtil paginationUtil;
     private final WebResource    webResource;
     private final TemplateAPI    templateAPI;
@@ -319,8 +319,8 @@ public final Response saveDraft(@Context final HttpServletRequest  request,
         final Template newVersionTemplate = new Template();
         newVersionTemplate.setIdentifier(currentTemplate.getIdentifier());
 
-        return Response.ok(new ResponseEntityView(this.templateHelper.toTemplateView(
-                this.fillAndSaveTemplate(templateForm, user, host, pageMode, newVersionTemplate, true), user))).build();
+        return Response.ok(new ResponseEntityView<>(this.templateHelper.toTemplateView(
+                this.fillAndSaveDraftTemplate(templateForm, user, host, pageMode, newVersionTemplate), user))).build();
     }
 
     @WrapInTransaction
@@ -331,7 +331,23 @@ private Template fillAndSaveTemplate(final TemplateForm templateForm,
                                          final Template template) throws DotSecurityException, DotDataException {
 
 
-        return fillAndSaveTemplate(templateForm, user, host, pageMode, template, false);
+        template.setInode(StringPool.BLANK);
+        fillTemplate(templateForm, user, host, pageMode.respectAnonPerms, template);
+
+        if (null != templateForm.getLayout()) {
+            final TemplateLayout templateLayout = this.templateHelper.toTemplateLayout(templateForm.getLayout());
+            template.setDrawedBody(templateLayout);
+            template.setDrawed(true);
+            this.templateAPI.saveAndUpdateLayout(template, templateLayout, host, user, pageMode.respectAnonPerms);
+        } else {
+            template.setDrawedBody(templateForm.getDrawedBody());
+            this.templateAPI.saveTemplate(template, host, user, pageMode.respectAnonPerms);
+        }
+
+        ActivityLogger.logInfo(this.getClass(), "Saved Template", USER + user.getPrimaryKey()
+                + "Template: " + template.getTitle(), host.getTitle() != null? host.getTitle():"default");
+
+        return template;
     }
 
     /**
@@ -343,20 +359,29 @@ private Template fillAndSaveTemplate(final TemplateForm templateForm,
      * @param pageMode     The {@link PageMode} object used to determine whether anonymous permissions must be respected
      *                     or not.
      * @param template     The {@link Template} object that will hold the incoming data.
-     * @param draft        If the Template is being saved as draft, set this to {@code true}.
      * @return The new Template.
      * @throws DotSecurityException The specified User does not have permission to save this Template.
      * @throws DotDataException     An error occurred when interacting with the data source.
      */
     @WrapInTransaction
-    private Template fillAndSaveTemplate(final TemplateForm templateForm,
+    private Template fillAndSaveDraftTemplate(final TemplateForm templateForm,
             final User user,
             final Host site,
             final PageMode pageMode,
-            final Template template,
-            final boolean draft) throws DotSecurityException, DotDataException {
+                                              final Template template) throws DotSecurityException, DotDataException {
 
-        template.setInode(draft?templateForm.getInode(): StringPool.BLANK);
+        template.setInode(templateForm.getInode());
+        fillTemplate(templateForm, user, site, pageMode.respectAnonPerms, template);
+
+        this.templateAPI.saveDraftTemplate(template, site, user,pageMode.respectAnonPerms);
+
+        ActivityLogger.logInfo(this.getClass(), "Saved Template", USER + user.getPrimaryKey()
+                + "Template: " + template.getTitle(), site.getTitle() != null? site.getTitle():"default");
+
+        return template;
+    }
+
+    private static void fillTemplate(TemplateForm templateForm, User user, Host site, boolean respectAnonPerms, Template template) throws DotSecurityException, DotDataException {
         template.setTheme(UtilMethods.isSet(templateForm.getTheme()) ? templateForm.getTheme() : Theme.SYSTEM_THEME);
         template.setBody(templateForm.getBody());
         template.setCountContainers(templateForm.getCountAddContainer());
@@ -366,15 +391,6 @@ private Template fillAndSaveTemplate(final TemplateForm templateForm,
         template.setModUser(user.getUserId());
         template.setModDate(new Date());
 
-        ContainerUUIDChanges containerUUIDChanges = null;
-
-        if (null != templateForm.getLayout()) {
-            containerUUIDChanges = templateForm.getLayout().updateUUIDOfContainers();
-            template.setDrawedBody(this.templateHelper.toTemplateLayout(templateForm.getLayout()));
-            template.setDrawed(true);
-        } else {
-            template.setDrawedBody(templateForm.getDrawedBody());
-        }
         template.setFooter(templateForm.getFooter());
         template.setFriendlyName(templateForm.getFriendlyName());
         template.setHeadCode(templateForm.getHeadCode());
@@ -383,51 +399,16 @@ private Template fillAndSaveTemplate(final TemplateForm templateForm,
         template.setHeader(templateForm.getHeader());
 
         if (templateForm.isDrawed()) {
-            final String themeHostId = APILocator.getFolderAPI().find(templateForm.getTheme(), user, pageMode.respectAnonPerms).getHostId();
+            final String themeHostId = APILocator.getFolderAPI().find(templateForm.getTheme(), user, respectAnonPerms).getHostId();
             final String themePath   = themeHostId.equals(site.getInode())?
                     Template.THEMES_PATH + template.getThemeName() + "/":
-                    "//" + APILocator.getHostAPI().find(themeHostId, user, pageMode.respectAnonPerms).getHostname()
+                    "//" + APILocator.getHostAPI().find(themeHostId, user, respectAnonPerms).getHostname()
                             + Template.THEMES_PATH + template.getThemeName() + "/";
 
             final StringBuffer endBody = DesignTemplateUtil.getBody(template.getBody(), template.getHeadCode(),
                     themePath, templateForm.isHeaderCheck(), templateForm.isFooterCheck());
             template.setBody(endBody.toString());
         }
-
-
-        if (draft) {
-            this.templateAPI.saveDraftTemplate(template, site, user, pageMode.respectAnonPerms);
-        } else {
-            this.templateAPI.saveTemplate(template, site, user, pageMode.respectAnonPerms);
-        }
-
-        if (UtilMethods.isSet(containerUUIDChanges) && UtilMethods.isSet(containerUUIDChanges.lostUUIDValues())){
-            updateMultiTree(template, containerUUIDChanges);
-
-        }
-
-        ActivityLogger.logInfo(this.getClass(), "Saved Template", "User " + user.getPrimaryKey()
-                + "Template: " + template.getTitle(), site.getTitle() != null? site.getTitle():"default");
-
-        return template;
-    }
-
-    private static void updateMultiTree(final Template template, final ContainerUUIDChanges containerUUIDChanges)
-            throws DotDataException, DotSecurityException {
-        final List<Contentlet> pagesByTemplate = APILocator.getHTMLPageAssetAPI()
-                .findPagesByTemplate(template, APILocator.systemUser(), false);
-
-        final List<String> pagesId = pagesByTemplate.stream()
-                .map(contentlet -> contentlet.getIdentifier())
-                .collect(Collectors.toList());
-
-        if (UtilMethods.isSet(pagesId)) {
-            for (ContainerUUIDChanged lostUUIDValue : containerUUIDChanges.lostUUIDValues()) {
-                APILocator.getMultiTreeAPI().updateMultiTrees(pagesId, lostUUIDValue.containerId,
-                        lostUUIDValue.oldValue,
-                        lostUUIDValue.newValue);
-            }
-        }
     }
 
     /**
diff --git a/dotCMS/src/main/java/com/dotmarketing/factories/MultiTreeAPI.java b/dotCMS/src/main/java/com/dotmarketing/factories/MultiTreeAPI.java
index de01d21adb53..6407984d5f0a 100644
--- a/dotCMS/src/main/java/com/dotmarketing/factories/MultiTreeAPI.java
+++ b/dotCMS/src/main/java/com/dotmarketing/factories/MultiTreeAPI.java
@@ -7,6 +7,7 @@
 import com.dotmarketing.exception.DotSecurityException;
 import com.dotmarketing.portlets.containers.model.Container;
 import com.dotmarketing.portlets.htmlpageasset.model.IHTMLPage;
+import com.dotmarketing.portlets.templates.design.bean.LayoutChanges;
 import com.google.common.collect.Table;
 
 import java.util.Collection;
@@ -33,7 +34,7 @@ public interface MultiTreeAPI {
 
     /**
      * Saves MultiTrees for a given page
-     * 
+     *
      * @param mTrees
      * @throws DotDataException
      */
@@ -41,7 +42,7 @@ public interface MultiTreeAPI {
 
     /**
      * Saves a specific MultiTree as it comes
-     * 
+     *
      * @param multiTree
      * @throws DotDataException
      */
@@ -55,7 +56,7 @@ public interface MultiTreeAPI {
     void saveMultiTreeAndReorder(final MultiTree mTree) throws DotDataException;
     /**
      * Deletes a specific MultiTree
-     * 
+     *
      * @param multiTree
      * @throws DotDataException
      */
@@ -71,7 +72,7 @@ public interface MultiTreeAPI {
 
     /**
      * Removes any mutlitree that has the identifiers as either a parent or as a child
-     * 
+     *
      * @param identifiers
      * @throws DotDataException
      */
@@ -81,7 +82,7 @@ public interface MultiTreeAPI {
     /**
      * deletes all the multi tress related to the identifier, including parents and child in addition
      * for the pages related refresh the cache and publish relationships
-     * 
+     *
      * @param identifier String
      * @throws DotDataException
      */
@@ -125,7 +126,7 @@ Table<String, String, Set<PersonalizedContentlet>> getPageMultiTrees(final IHTML
 
     /**
      * Saves a list of MultiTrees
-     * 
+     *
      * @param mTrees
      * @throws DotDataException
      */
@@ -133,7 +134,7 @@ Table<String, String, Set<PersonalizedContentlet>> getPageMultiTrees(final IHTML
 
     /**
      * Deletes a list of MultiTrees
-     * 
+     *
      * @param mTree
      * @throws DotDataException
      */
@@ -141,7 +142,7 @@ Table<String, String, Set<PersonalizedContentlet>> getPageMultiTrees(final IHTML
 
     /**
      * Deletes all MultiTrees that have either this page id or container id as a parent
-     * 
+     *
      * @param pageOrContainer
      * @throws DotDataException
      */
@@ -149,7 +150,7 @@ Table<String, String, Set<PersonalizedContentlet>> getPageMultiTrees(final IHTML
 
     /**
      * Deletes all MultiTrees that have contentlet id as a child
-     * 
+     *
      * @param contentIdentifier
      * @throws DotDataException
      */
@@ -159,7 +160,7 @@ Table<String, String, Set<PersonalizedContentlet>> getPageMultiTrees(final IHTML
 
     /**
      * Gets them all
-     * 
+     *
      * @return
      */
     List<MultiTree> getAllMultiTrees();
@@ -172,11 +173,11 @@ Table<String, String, Set<PersonalizedContentlet>> getPageMultiTrees(final IHTML
      * @throws DotDataException
      */
     List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
-            final String personalization, final String targetVariantName) throws DotDataException;
+                                                    final String personalization, final String targetVariantName) throws DotDataException;
 
     /**
      * Gets a list of all MultiTrees on a page (even if they are bad)
-     * 
+     *
      * @param parentInode
      * @return
      * @throws DotDataException
@@ -185,7 +186,7 @@ List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
 
     /**
      * Gets a list of MultiTrees that belong to the page+container+container instance
-     * 
+     *
      * @param htmlPage
      * @param container
      * @param containerInstance
@@ -206,7 +207,7 @@ List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
 
     /**
      * Gets a list of MultiTrees that belong to the page+container
-     * 
+     *
      * @param htmlPage
      * @param container
      * @return
@@ -215,7 +216,7 @@ List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
 
     /**
      * Gets a list of MultiTrees that belong to the page+container
-     * 
+     *
      * @param htmlPage
      * @param container
      * @return
@@ -224,7 +225,7 @@ List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
 
     /**
      * Gets a list of MultiTrees that belong to the page+container+container instance
-     * 
+     *
      * @param htmlPage
      * @param container
      * @param containerInstance
@@ -234,7 +235,7 @@ List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
 
     /**
      * Gets a list of MultiTrees that belong to the container on any page
-     * 
+     *
      * @param containerIdentifier
      * @return List Multitree
      */
@@ -242,7 +243,7 @@ List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
 
     /**
      * gets all MultiTrees that have contentlet id as a child
-     * 
+     *
      * @param contentIdentifier page Or Container
      * @throws DotDataException
      */
@@ -250,7 +251,7 @@ List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
 
     /**
      * gets all MultiTrees that in a container of a particular content type
-     * 
+     *
      * @param containerIdentifier
      * @param structureInode
      * @return
@@ -259,7 +260,7 @@ List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
 
     /**
      * gets the containers with MultiTree entries on a page (The containers may or may not exist)
-     * 
+     *
      * @param pageId
      * @return
      * @throws DotDataException
@@ -268,7 +269,7 @@ List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
 
     /**
      * Gets a specific MultiTree entry
-     * 
+     *
      * @param htmlPage
      * @param container
      * @param childContent
@@ -281,7 +282,7 @@ MultiTree getMultiTree(Identifier htmlPage, Identifier container, Identifier chi
 
     /**
      * Gets a specific MultiTree entry
-     * 
+     *
      * @param htmlPage
      * @param container
      * @param childContent
@@ -318,7 +319,7 @@ MultiTree getMultiTree(Identifier htmlPage, Identifier container, Identifier chi
 
     /**
      * Gets a specific MultiTree entry regardless of containerInstance
-     * 
+     *
      * @param htmlPage
      * @param container
      * @param childContent
@@ -329,7 +330,7 @@ MultiTree getMultiTree(Identifier htmlPage, Identifier container, Identifier chi
 
     /**
      * Gets a list of MultiTrees that have the Identifier as a Parent
-     * 
+     *
      * @param parent Container or Page
      * @return
      */
@@ -337,7 +338,7 @@ MultiTree getMultiTree(Identifier htmlPage, Identifier container, Identifier chi
 
     /**
      * Gets a list of MultiTrees that have the Identifiers as a Parent Page+Container
-     * 
+     *
      * @param htmlPage
      * @param container
      * @return
@@ -346,7 +347,7 @@ MultiTree getMultiTree(Identifier htmlPage, Identifier container, Identifier chi
 
     /**
      * Gets a list of MultiTrees that has the parentId as a parent
-     * 
+     *
      * @param parentId page id
      * @return
      */
@@ -409,7 +410,7 @@ MultiTree getMultiTree(Identifier htmlPage, Identifier container, Identifier chi
      * @return List MultiTree
      */
     List<MultiTree> copyPersonalizationForPage (String pageId, String basePersonalization,
-            String newPersonalization, final String targetVariantName ) throws DotDataException;
+                                                String newPersonalization, final String targetVariantName ) throws DotDataException;
 
     /**
      * Take a set of containers with a based personalization (the default one) and set to new personalization, for a page.
@@ -418,8 +419,8 @@ List<MultiTree> copyPersonalizationForPage (String pageId, String basePersonaliz
      * @return List MultiTree
      */
     default List<MultiTree> copyPersonalizationForPage (final String pageId, final String newPersonalization,
-            final String targetVariantName)
-                throws DotDataException {
+                                                        final String targetVariantName)
+            throws DotDataException {
 
         return this.copyPersonalizationForPage(pageId, MultiTree.DOT_PERSONALIZATION_DEFAULT,
                 newPersonalization, targetVariantName);
@@ -453,9 +454,9 @@ default List<MultiTree> copyPersonalizationForPage (final String pageId, final S
      * @throws DotDataException
      */
     void overridesMultitreesByPersonalization(final String pageId,
-            final String personalization,
-            final List<MultiTree> multiTrees,
-            final Optional<Long> languageIdOpt
+                                              final String personalization,
+                                              final List<MultiTree> multiTrees,
+                                              final Optional<Long> languageIdOpt
     ) throws DotDataException;
 
     /**
@@ -472,11 +473,11 @@ void overridesMultitreesByPersonalization(final String pageId,
      * @throws DotDataException
      */
     void overridesMultitreesByPersonalization(final String pageId,
-                                             final String personalization,
-                                             final List<MultiTree> multiTrees,
-                                             final Optional<Long> languageIdOpt,
-                                             final String variantId
-                                        ) throws DotDataException;
+                                              final String personalization,
+                                              final List<MultiTree> multiTrees,
+                                              final Optional<Long> languageIdOpt,
+                                              final String variantId
+    ) throws DotDataException;
 
     /**
      * Copy a collection of {@link MultiTree} but to a different {@link Variant}.
@@ -487,7 +488,7 @@ void overridesMultitreesByPersonalization(final String pageId,
      * @throws DotDataException
      */
     void copyMultiTree(final String pageId, final List<MultiTree> multiTrees,
-            String variantName)
+                       String variantName)
             throws DotDataException;
 
     /**
@@ -511,19 +512,6 @@ void copyMultiTree(final String pageId, final List<MultiTree> multiTrees,
      */
     int getAllContentletReferencesCount(final String contentletId) throws DotDataException;
 
-    /**
-     * Update the UUID of a set of MultiTree to a new UUID value
-     *
-     * @param pagesId Set of page's id to be updated
-     * @param containerId Container's id to be updated
-     * @param oldValue old UUID value to be updated
-     * @param newValue new value to set
-     *
-     * @throws DotDataException
-     */
-    void updateMultiTrees(final Collection<String> pagesId, final String containerId,
-            final String oldValue, final String newValue) throws DotDataException;
-
     /**
      * Return all the {@link MultiTree} for a {@link Variant}
      *
@@ -531,4 +519,19 @@ void updateMultiTrees(final Collection<String> pagesId, final String containerId
      * @return
      */
     List<MultiTree> getMultiTrees(final Variant variant) throws DotDataException;
-}
+
+    /**
+     * After layout changes, this method updates the UUID (relation_type field) of a set of pages in a
+     * MultiTree according to changes in the layout.
+     *
+     * For example, if you have a layout with one instance of a container,
+     * the UUID for this container is initially set to 1. If later you add a second instance on top of the layout,
+     * the UUID of the original instance will change from 1 to 2. Consequently, the MultiTree of the pages using
+     * this layout needs to be updated as well.
+     *
+     * @param layoutChanges
+     * @param pageIds
+     * @throws DotDataException
+     */
+    void updateMultiTrees(final LayoutChanges layoutChanges, final Collection<String> pageIds) throws DotDataException;
+}
\ No newline at end of file
diff --git a/dotCMS/src/main/java/com/dotmarketing/factories/MultiTreeAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/factories/MultiTreeAPIImpl.java
index 53a95809cc3a..ee2ede3922e3 100644
--- a/dotCMS/src/main/java/com/dotmarketing/factories/MultiTreeAPIImpl.java
+++ b/dotCMS/src/main/java/com/dotmarketing/factories/MultiTreeAPIImpl.java
@@ -24,7 +24,6 @@
 import com.dotmarketing.exception.DotRuntimeException;
 import com.dotmarketing.exception.DotSecurityException;
 import com.dotmarketing.portlets.containers.business.ContainerAPI;
-import com.dotmarketing.portlets.containers.business.FileAssetContainerUtil;
 import com.dotmarketing.portlets.containers.model.Container;
 import com.dotmarketing.portlets.containers.model.FileAssetContainer;
 import com.dotmarketing.portlets.contentlet.business.ContentletAPI;
@@ -33,11 +32,14 @@
 import com.dotmarketing.portlets.contentlet.model.ContentletVersionInfo;
 import com.dotmarketing.portlets.htmlpageasset.model.IHTMLPage;
 import com.dotmarketing.portlets.templates.design.bean.ContainerUUID;
+import com.dotmarketing.portlets.templates.design.bean.LayoutChanges;
 import com.dotmarketing.portlets.templates.design.bean.TemplateLayout;
 import com.dotmarketing.portlets.templates.model.Template;
+import com.dotmarketing.util.Config;
 import com.dotmarketing.util.Logger;
 import com.dotmarketing.util.PageMode;
 import com.dotmarketing.util.UtilMethods;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -46,23 +48,17 @@
 import com.liferay.util.StringPool;
 import io.vavr.Lazy;
 import io.vavr.control.Try;
-import java.util.Collections;
+
+import java.util.*;
 import java.util.stream.Stream;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+
 /**
  * This class provides utility routines to interact with the Multi-Tree structures in the system. A
  * Multi-Tree represents the relationship between a Legacy or Content Page, a container, and a
@@ -71,11 +67,13 @@
  * Therefore, the content of a page can be described as the sum of several Multi-Tree records which
  * represent each piece of information contained in it.
  * </p>
- * 
+ *
  * @author will
  */
 public class MultiTreeAPIImpl implements MultiTreeAPI {
 
+    private static Lazy<Boolean> deleteOrphanedContentsFromContainer =
+            Lazy.of(() -> Config.getBooleanProperty("DELETE_ORPHANED_CONTENTS_FROM_CONTAINER", true));
     private static final String SELECT_MULTITREES_BY_VARIANT = "SELECT * FROM multi_tree WHERE variant_id = ?";
     private final Lazy<MultiTreeCache> multiTreeCache = Lazy.of(CacheLocator::getMultiTreeCache);
 
@@ -195,7 +193,7 @@ public void deleteMultiTree(final String pageId, final String variant)throws Dot
      * @param multiTree
      * @throws DotDataException
      * @throws DotSecurityException
-     * 
+     *
      */
     private void _dbDelete(final MultiTree multiTree) throws DotDataException {
 
@@ -213,7 +211,7 @@ private void _dbDelete(final MultiTree multiTree) throws DotDataException {
     @CloseDBIfOpened
     @Override
     public MultiTree getMultiTree(final Identifier htmlPage, final Identifier container, final Identifier childContent,
-            final String containerInstance) throws DotDataException {
+                                  final String containerInstance) throws DotDataException {
         return getMultiTree(htmlPage.getId(), container.getId(), childContent.getId(), containerInstance);
     }
 
@@ -236,7 +234,7 @@ public MultiTree getMultiTree(final String htmlPage, final String container, fin
 
     @Override
     public MultiTree getMultiTree(final String htmlPage, final String container, final String childContent,
-            final String containerInstance,  final String personalization, final String variantId)
+                                  final String containerInstance,  final String personalization, final String variantId)
             throws DotDataException {
         final DotConnect db =
                 new DotConnect().setSQL(SELECT_SQL).addParam(htmlPage).addParam(container)
@@ -251,7 +249,7 @@ public MultiTree getMultiTree(final String htmlPage, final String container, fin
     /**
      * Use {@link #getMultiTree(String, String, String, String)} This method does not use the unique id
      * specified in the #parseContainer code
-     * 
+     *
      * @param htmlPage
      * @param container
      * @param childContent
@@ -323,7 +321,7 @@ public Set<String> getPersonalizationsForPage(final String pageID) throws DotDat
                 .fromContentlet(APILocator.getContentletAPI().findContentletByIdentifierAnyLanguage(pageID));
         return getPersonalizationsForPage(pageId);
     }
-    
+
     @CloseDBIfOpened
     @Override
     public Set<String> getPersonalizationsForPage(final IHTMLPage page) throws DotDataException {
@@ -424,7 +422,7 @@ public List<MultiTree> copyPersonalizationForPage (final String pageId,
         if (null != basedMultiTreeList) {
 
             basedMultiTreeList.forEach(multiTree -> personalizedContainerListBuilder.add(
-                        MultiTree.buildMultitree(multiTree, targetVariantName, newPersonalization))
+                    MultiTree.buildMultitree(multiTree, targetVariantName, newPersonalization))
             );
 
             multiTrees = personalizedContainerListBuilder.build();
@@ -437,10 +435,10 @@ public List<MultiTree> copyPersonalizationForPage (final String pageId,
     @WrapInTransaction
     @Override
     public void deletePersonalizationForPage(final String pageId, final String personalization,
-            final String variantName) throws DotDataException {
+                                             final String variantName) throws DotDataException {
 
         Logger.debug(this, "Removing personalization for: " + pageId +
-                                ", personalization: " + personalization);
+                ", personalization: " + personalization);
         final List<MultiTree> pageMultiTrees = this.getMultiTreesByPersonalizedPage(pageId,
                 personalization, variantName);
 
@@ -465,7 +463,7 @@ public void deletePersonalizationForPage(final String pageId, final String perso
     @CloseDBIfOpened
     @Override
     public List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
-            final String personalization, final String variantName) throws DotDataException {
+                                                           final String personalization, final String variantName) throws DotDataException {
 
         return TransformerLocator.createMultiTreeTransformer(
                 new DotConnect().setSQL(SELECT_BY_PAGE_AND_PERSONALIZATION)
@@ -473,12 +471,12 @@ public List<MultiTree> getMultiTreesByPersonalizedPage(final String pageId,
                         .addParam(personalization)
                         .addParam(variantName)
                         .loadObjectResults()
-                ).asList();
+        ).asList();
     }
 
     /**
      * Returns the tree with the pages that matched on the parent1
-     * 
+     *
      * @param parentInode
      * @return
      * @throws DotDataException
@@ -561,7 +559,7 @@ public List<MultiTree> getMultiTreesByChild(final String contentIdentifier) thro
 
     /**
      * Get a list of MultiTree for Contentlets using a specific Structure and specific Container
-     * 
+     *
      * @param containerIdentifier
      * @param structureInode
      * @return List of MultiTree
@@ -611,7 +609,7 @@ public void saveMultiTreeAndReorder(final MultiTree mTree) throws DotDataExcepti
      * <li>The type of content relation.</li>
      * <li>The order in which this construct is added to the database.</li>
      * </ol>
-     * 
+     *
      * @param mTrees - The multi-tree structure.
      * @throws DotDataException
      */
@@ -660,15 +658,15 @@ public void overridesMultitreesByPersonalization(final String pageId,
      * @param multiTrees {@link List} of {@link MultiTree} to safe
      * @param languageIdOpt {@link Optional} {@link Long}   optional language, if present will deletes only the contentlets that have a version on this language.
      *                                        Since it is by identifier, when deleting for instance in spanish, will remove the english and any other lang version too.
-     * @throws DotDataException 
+     * @throws DotDataException
      */
     @Override
     @WrapInTransaction
     public void overridesMultitreesByPersonalization(final String pageId,
-                                                    final String personalization,
-                                                    final List<MultiTree> multiTrees,
-                                                    final Optional<Long> languageIdOpt,
-                                                    final String variantId) throws DotDataException {
+                                                     final String personalization,
+                                                     final List<MultiTree> multiTrees,
+                                                     final Optional<Long> languageIdOpt,
+                                                     final String variantId) throws DotDataException {
 
         Logger.info(this, String.format(
                 "Overriding MultiTrees: pageId -> %s personalization -> %s multiTrees-> %s ",
@@ -685,7 +683,7 @@ public void overridesMultitreesByPersonalization(final String pageId,
         if (languageIdOpt.isPresent()) {
             if (DbConnectionFactory.isMySql()) {
                 deleteMultiTreeToMySQL(pageId, personalization, languageIdOpt, variantId);
-           } else {
+            } else {
                 originalContentletIds = this.getOriginalContentlets(pageId, ContainerUUID.UUID_DEFAULT_VALUE,
                         personalization, variantId, languageIdOpt.get());
                 db.setSQL(DELETE_ALL_MULTI_TREE_SQL_BY_RELATION_AND_PERSONALIZATION_PER_LANGUAGE_NOT_SQL)
@@ -734,7 +732,7 @@ public void copyMultiTree(final String pageId, final List<MultiTree> multiTrees)
     @Override
     @WrapInTransaction
     public void copyMultiTree(final String pageId, final List<MultiTree> multiTrees,
-            final String variantName) throws DotDataException {
+                              final String variantName) throws DotDataException {
 
         DotPreconditions.notNull(multiTrees, () -> "multiTrees can't be null");
 
@@ -757,7 +755,7 @@ public void copyMultiTree(final String pageId, final List<MultiTree> multiTrees,
             if(contentExist != 0){
                 final String contentletTitle = APILocator.getContentletAPI().findContentletByIdentifierAnyLanguage(tree.getContentlet()).getTitle();
                 final String errorMsg = String.format("Content '%s' [ %s ] has already been added to Container " +
-                                                              "'%s'", contentletTitle, tree.getContentlet(),
+                                "'%s'", contentletTitle, tree.getContentlet(),
                         tree.getContainer());
                 Logger.debug(MultiTreeAPIImpl.class, errorMsg);
                 throw new IllegalArgumentException(errorMsg);
@@ -773,8 +771,8 @@ public void copyMultiTree(final String pageId, final List<MultiTree> multiTrees,
 
     @Override
     public void overridesMultitreesByPersonalization(String pageId,
-            String personalization, List<MultiTree> multiTrees,
-            Optional<Long> languageIdOpt) throws DotDataException {
+                                                     String personalization, List<MultiTree> multiTrees,
+                                                     Optional<Long> languageIdOpt) throws DotDataException {
         overridesMultitreesByPersonalization(pageId, personalization, multiTrees,
                 languageIdOpt, VariantAPI.DEFAULT_VARIANT.name());
     }
@@ -786,13 +784,13 @@ private void deleteMultiTreeToMySQL(
         final DotConnect db = new DotConnect();
 
         final List<String> multiTreesId = db.setSQL(SELECT_MULTI_TREE_BY_LANG)
-            .addParam(pageId)
-            .addParam(languageIdOpt.get())
-            .addParam(variantId)
-            .loadObjectResults()
-            .stream()
-            .map(map -> String.format("'%s'", map.get("identifier")))
-            .collect(Collectors.toList());
+                .addParam(pageId)
+                .addParam(languageIdOpt.get())
+                .addParam(variantId)
+                .loadObjectResults()
+                .stream()
+                .map(map -> String.format("'%s'", map.get("identifier")))
+                .collect(Collectors.toList());
 
         if (!multiTreesId.isEmpty()) {
 
@@ -809,10 +807,10 @@ private void deleteMultiTreeToMySQL(
     public void updatePersonalization(final String currentPersonalization, final String newPersonalization) throws DotDataException {
 
         Logger.info(this, "Updating the personalization: " + currentPersonalization +
-                                        " to " + newPersonalization);
+                " to " + newPersonalization);
         final List<Map<String, Object>> currentPersonalizationPages =
                 new DotConnect().setSQL("select parent1 from multi_tree where personalization = ?")
-                .addObject(currentPersonalization).loadObjectResults();
+                        .addObject(currentPersonalization).loadObjectResults();
 
         new DotConnect().setSQL(UPDATE_MULTI_TREE_PERSONALIZATION)
                 .addParam(newPersonalization)
@@ -923,12 +921,12 @@ private void _dbInsert(final MultiTree multiTree) throws DotDataException {
      * Update the version_ts of all versions of the HTML Page with the given id. If a MultiTree Object
      * has been added or deleted from this page, its version_ts value needs to be updated so it can be
      * included in future Push Publishing tasks
-     * 
+     *
      * @param pageId The HTMLPage Identifier to pass in
      * @throws DotContentletStateException
      * @throws DotDataException
      * @throws DotSecurityException
-     * 
+     *
      */
     private void updateHTMLPageVersionTS(final String pageId, final String variantName) throws DotDataException {
         final List<ContentletVersionInfo> contentletVersionInfos =
@@ -1005,8 +1003,8 @@ private Collection<String> getInodes(String pageIdentifier, String variantName)
         if (UtilMethods.isSet(contentletVersionInfos)) {
             return getInodes(contentletVersionInfos);
         } else {
-           return  getInodes(APILocator.getVersionableAPI()
-                   .findContentletVersionInfos(pageIdentifier, VariantAPI.DEFAULT_VARIANT.name()));
+            return  getInodes(APILocator.getVersionableAPI()
+                    .findContentletVersionInfos(pageIdentifier, VariantAPI.DEFAULT_VARIANT.name()));
         }
     }
 
@@ -1064,7 +1062,7 @@ public Table<String, String, Set<PersonalizedContentlet>> getPageMultiTrees(fina
     @CloseDBIfOpened
     @Override
     public Table<String, String, Set<PersonalizedContentlet>> getPageMultiTrees(final IHTMLPage page,
-            final String variantName, final boolean liveMode) throws DotDataException, DotSecurityException {
+                                                                                final String variantName, final boolean liveMode) throws DotDataException, DotSecurityException {
 
         final String multiTreeCacheKey = page.getIdentifier();
         final Optional<Table<String, String, Set<PersonalizedContentlet>>> pageContentsOpt =
@@ -1128,7 +1126,7 @@ public Table<String, String, Set<PersonalizedContentlet>> getPageMultiTrees(fina
         }
 
         this.addEmptyContainers(page, pageContents, liveMode);
-        
+
         CacheLocator.getMultiTreeCache().putPageMultiTrees(multiTreeCacheKey, variantName, liveMode, pageContents);
         return pageContents;
     }
@@ -1224,7 +1222,7 @@ protected boolean doesPageContentsHaveContainer(
             final Container container) {
 
 
-         if(pageContents.contains(container.getIdentifier(), containerUUID.getUUID())){
+        if(pageContents.contains(container.getIdentifier(), containerUUID.getUUID())){
             return true;
         } else if(pageContents.contains(container.getIdentifier(), ParseContainer.PARSE_CONTAINER_UUID_PREFIX + containerUUID.getUUID())) {
             return true;
@@ -1252,53 +1250,181 @@ public int getAllContentletReferencesCount(final String contentletId) throws Dot
         return count.intValue();
     }
 
+
+
     @Override
     @WrapInTransaction
-    public void updateMultiTrees(final Collection<String> pagesId, final String containerId,
-            final String oldValue, final String newValue) throws DotDataException {
+    public List<MultiTree> getMultiTrees(final Variant variant) throws DotDataException {
+        final List<Map<String, Object>> results = new DotConnect().setSQL(SELECT_MULTITREES_BY_VARIANT)
+                .addParam(variant.name())
+                .loadResults();
 
-        DotPreconditions.notNull(pagesId, () -> "Pages id collection cannot be null");
-        DotPreconditions.isTrue(!pagesId.isEmpty(), () -> "Pages id collection cannot be empty");
+        return TransformerLocator.createMultiTreeTransformer(results).asList();
+    }
+
+
+    /**
+     * Update the {@link MultiTree} according to the {@link LayoutChanges}.
+     * The steps follows to update the MultiTree are:
+     *
+     * 1. Mark all the MultiTree to be updated. These are all the MultiTree on the pageIds and in the Containers that
+     * were changed. These MultiTree are marked by turning their relation_type to a negative number.
+     * We avoid using the -1 value because it's already used for orphan Contentlet. To calculate this new value,
+     * the following function is used:
+     *
+     * <code></>(relation_type AS numeric * -1) - 1</code>
+     *
+     *  This allowed us to later update the MultiTree without taking care of the order in which the
+     *  SQL Statements were executed.
+     *
+     *  2. Update the MultiTree to its new relation_type value according to the changes thar were applied,
+     *  for this the UPDATE STATEMENT Syntax is:
+     *
+     *  UPDATE multi_tree SET relation_type = [temporal negative value]
+     *  WHERE parent1 = [for each page] AND parent2 = [for each container] and relation_type = [new_value]
+     *
+     * These Update STATEMENT are executed using BATCH for performance reasons.
+     *
+     * 3. DELETE or mark as orphan the MultiTree on the Container that were removed.
+     * The action taken (delete or mark as orphan) depends on whether the DELETE_ORPHANED_CONTENTS_FROM_CONTAINER
+     * option is enabled or not.
+     *
+     * @param layoutChanges
+     * @param identifiers
+     * @throws DotDataException
+     */
+    @Override
+    @WrapInTransaction
+    public void updateMultiTrees(final LayoutChanges layoutChanges, final Collection<String> pageIds) throws DotDataException {
+        final List<Params> parametersToMark = new ArrayList<>();
 
-        final String innerContainerId = FileAssetContainerUtil.getInstance().isFolderAssetContainerId(containerId)
-                ? getFileContainerId(containerId) : containerId;
+        final boolean deleteOrphanedContents = deleteOrphanedContentsFromContainer.get();
 
-        final String updateQuery = String.format("UPDATE multi_tree set relation_type = ? WHERE parent1 in (%s) AND parent2 = ? AND relation_type = ?",
-                pagesId.stream().map(value -> "'" + value + "'").collect(Collectors.joining(",")));
+        markMultiTreeToUpdate(layoutChanges, pageIds, parametersToMark);
 
-        new DotConnect().setSQL(updateQuery)
-                .addParam(newValue)
-                .addParam(innerContainerId)
-                .addParam(oldValue)
-                .loadResult();
+        updateMarkedMultiTrees(layoutChanges, pageIds);
+
+        if (deleteOrphanedContents) {
+            removeMultiTrees(layoutChanges, pageIds);
+        }
 
-        pagesId.stream().forEach(pageId -> {
+        pageIds.stream().forEach(pageId -> {
             CacheLocator.getMultiTreeCache().removePageMultiTrees(pageId);
             CacheLocator.getHTMLPageCache().remove(pageId);
         });
     }
 
-    @Override
-    @WrapInTransaction
-    public List<MultiTree> getMultiTrees(final Variant variant) throws DotDataException {
-        final List<Map<String, Object>> results = new DotConnect().setSQL(SELECT_MULTITREES_BY_VARIANT)
-                .addParam(variant.name())
-                .loadResults();
+    /**
+     * DELETE or mark as orphan the MultiTree on the Container that were removed.
+     * The action taken (delete or mark as orphan) depends on whether the DELETE_ORPHANED_CONTENTS_FROM_CONTAINER
+     * option is enabled or not.
+     *
+     * These MultiTrees need to be marked first using the method {@link MultiTreeAPIImpl#markMultiTreeToUpdate(LayoutChanges, Collection, List)}
+     *
+     * @see MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)
+     *
+     * @param layoutChanges
+     * @param pageIds
+     * @throws DotDataException
+     */
+    private static void removeMultiTrees(LayoutChanges layoutChanges, final Collection<String> pageIds) throws DotDataException {
+        final List<Params> parametersToRemoved = new ArrayList<>();
+
+        for (String identifier : pageIds) {
+            parametersToRemoved.addAll(
+                    layoutChanges.getAll().stream()
+                            .filter(LayoutChanges.ContainerChanged::isRemove)
+                            .map(changed -> new Params.Builder()
+                                    .add(identifier, changed.getContainerId(), getMakValue(changed))
+                                    .build()
+                            )
+                            .collect(Collectors.toList())
+            );
+        }
 
-        return TransformerLocator.createMultiTreeTransformer(results).asList();
+        if (!parametersToRemoved.isEmpty()) {
+            new DotConnect().executeBatch("DELETE FROM multi_tree " +
+                    "WHERE parent1 = ? AND parent2 = ? and relation_type = ?", parametersToRemoved);
+        }
     }
 
+    /**
+     * Update the MultiTree to its new relation_type value according to the changes thar were applied,
+     *  for this the UPDATE STATEMENT Syntax is:
+     *
+     *  UPDATE multi_tree SET relation_type = [temporal negative value]
+     *  WHERE parent1 = [for each page] AND parent2 = [for each container] and relation_type = [new_value]
+     *
+     * These Update STATEMENT are executed using BATCH for performance reasons.
+     *
+     * These MultiTrees need to be marked first using the method {@link MultiTreeAPIImpl#markMultiTreeToUpdate(LayoutChanges, Collection, List)}
+     *
+     * @see MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)
+     *
+     * @param layoutChanges
+     * @param pageIds
+     * @throws DotDataException
+     */
+    private static void updateMarkedMultiTrees(final LayoutChanges layoutChanges, final Collection<String> pageIds)
+            throws DotDataException {
+        final boolean deleteOrphanedContents = deleteOrphanedContentsFromContainer.get();
+        final List<Params> parametersToUpdate = new ArrayList<>();
+
+        for (String identifier : pageIds) {
+            parametersToUpdate.addAll(
+                    layoutChanges.getAll().stream()
+                            .filter(changed -> !deleteOrphanedContents || changed.isMoved())
+                            .map(changed -> new Params.Builder()
+                                    .add(String.valueOf(changed.getNewInstanceId()),
+                                            identifier, changed.getContainerId(), getMakValue(changed))
+                                    .build()
+                            ).collect(Collectors.toList())
+            );
+        }
 
-    private String getFileContainerId(final String containerId) {
-        try {
-            return APILocator.getContainerAPI()
-                    .findContainer(containerId, APILocator.systemUser(), false, false)
-                    .map(container -> container.getIdentifier())
-                    .orElseThrow(() -> new DotRuntimeException("Invalid container ID: " + containerId));
-        } catch (DotDataException | DotSecurityException e) {
-            throw new RuntimeException(e);
+        new DotConnect().executeBatch("UPDATE multi_tree SET relation_type = ? " +
+                "WHERE parent1 = ? AND parent2 = ? and relation_type = ?", parametersToUpdate);
+    }
+
+    @NotNull
+    private static String getMakValue(LayoutChanges.ContainerChanged changed) {
+        return String.valueOf((Long.parseLong(changed.getOldInstanceId()) * -1) - 1);
+    }
+
+    /**
+     * Mark all the MultiTree to be updated. These are all the MultiTree on the pageIds and in the Containers that
+     * were changed. These MultiTree are marked by turning their relation_type to a negative number.
+     * We avoid using the -1 value because it's already used for orphan Contentlet. To calculate this new value,
+     * the following function is used:
+     *
+     * <code></>(relation_type AS numeric * -1) - 1</code>
+     *
+     *  This allowed us to later update the MultiTree without taking care of the order in which the
+     *  SQL Statements were executed.
+     *
+     * @param layoutChanges
+     * @param pageIds
+     * @param parametersToMark
+     * @throws DotDataException
+     *
+     * @see MultiTreeAPIImpl#updateMultiTrees(LayoutChanges, Collection)
+     */
+    private static void markMultiTreeToUpdate(final LayoutChanges layoutChanges, final Collection<String> pageIds,
+                                              final List<Params> parametersToMark) throws DotDataException {
+
+        for (String identifier : pageIds) {
+            parametersToMark.addAll(
+                    layoutChanges.getAll().stream()
+                            .filter(changed -> !changed.isNew())
+                            .map(changed -> new Params.Builder()
+                                    .add(identifier, changed.getContainerId(), changed.getOldInstanceId())
+                                    .build()
+                            ).collect(Collectors.toList())
+            );
         }
 
+        new DotConnect().executeBatch("UPDATE multi_tree SET relation_type = (CAST (relation_type AS numeric) * -1 )-1\n" +
+                "WHERE parent1 = ? AND parent2 = ? AND relation_type = ? AND relation_type <> '-1'", parametersToMark);
     }
 
     @CloseDBIfOpened
@@ -1403,10 +1529,14 @@ private void refreshContentletReferenceCount(final Set<String> originalContentle
         } else {
             final Set<String> updatedContentletIds = multiTrees.stream().map(MultiTree::getContentlet).collect(Collectors.toSet());
             final Set<String> modifiedIds = originalContentletIds.size() > updatedContentletIds.size() ?
-                                                    originalContentletIds.stream().filter(id -> !updatedContentletIds.contains(id)).collect(Collectors.toSet()) :
-                                                    updatedContentletIds.stream().filter(id -> !originalContentletIds.contains(id)).collect(Collectors.toSet());
+                    originalContentletIds.stream().filter(id -> !updatedContentletIds.contains(id)).collect(Collectors.toSet()) :
+                    updatedContentletIds.stream().filter(id -> !originalContentletIds.contains(id)).collect(Collectors.toSet());
             modifiedIds.forEach(id -> this.multiTreeCache.get().removeContentletReferenceCount(id));
         }
     }
 
-}
+    @VisibleForTesting
+    public static void setDeleteOrphanedContentsFromContainer(final boolean newValue){
+        deleteOrphanedContentsFromContainer = Lazy.of(() -> newValue);
+    }
+}
\ No newline at end of file
diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateAPI.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateAPI.java
index ad33a6a0b931..7052b2836742 100644
--- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateAPI.java
+++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateAPI.java
@@ -419,4 +419,21 @@ List<Template> findAllVersions(final Identifier identifier, final User user, fin
 	 */
 	List<HTMLPageVersion> getPages(final String templateId) throws DotDataException, DotSecurityException;
 
+	/**
+	 * Save and Update the Layout of a Template
+	 * This method calculate the changes on the current {@link TemplateLayout} of the Template and then update
+	 * the {@link com.dotmarketing.beans.MultiTree} using the {@link com.dotmarketing.factories.MultiTreeAPI#updateMultiTrees(LayoutChanges, Collection)}
+	 *
+	 *
+	 * @param template
+	 * @param newLayout
+	 * @param site
+	 * @param user
+	 * @param respectFrontendRoles
+	 * @return
+	 * @throws DotDataException
+	 * @throws DotSecurityException
+	 */
+	Template saveAndUpdateLayout(Template template, TemplateLayout newLayout, Host site, User user,
+								 boolean respectFrontendRoles) throws DotDataException, DotSecurityException;
 }
diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateAPIImpl.java
index ed8406b7e4df..58aa56f23c05 100644
--- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateAPIImpl.java
+++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/business/TemplateAPIImpl.java
@@ -8,15 +8,31 @@
 import com.dotcms.rendering.velocity.services.TemplateLoader;
 import com.dotcms.rendering.velocity.viewtools.DotTemplateTool;
 import com.dotcms.system.event.local.model.Subscriber;
-import com.dotmarketing.beans.*;
-import com.dotmarketing.business.*;
+import com.dotmarketing.beans.Host;
+import com.dotmarketing.beans.Identifier;
+import com.dotmarketing.beans.Inode;
+import com.dotmarketing.beans.SiteCreatedEvent;
+import com.dotmarketing.beans.Tree;
+import com.dotmarketing.beans.VersionInfo;
+import com.dotmarketing.beans.WebAsset;
+import com.dotmarketing.business.APILocator;
+import com.dotmarketing.business.BaseWebAssetAPI;
+import com.dotmarketing.business.CacheLocator;
+import com.dotmarketing.business.DotStateException;
+import com.dotmarketing.business.FactoryLocator;
+import com.dotmarketing.business.IdentifierAPI;
+import com.dotmarketing.business.PermissionAPI;
 import com.dotmarketing.business.PermissionAPI.PermissionableType;
+import com.dotmarketing.business.Theme;
+import com.dotmarketing.business.VersionableAPI;
 import com.dotmarketing.business.web.WebAPILocator;
-import com.dotmarketing.exception.*;
-import com.dotmarketing.factories.InodeFactory;
-import com.dotmarketing.factories.PublishFactory;
-import com.dotmarketing.factories.TreeFactory;
-import com.dotmarketing.factories.WebAssetFactory;
+import com.dotmarketing.exception.DotDataException;
+import com.dotmarketing.exception.DotDataValidationException;
+import com.dotmarketing.exception.DotRuntimeException;
+import com.dotmarketing.exception.DotSecurityException;
+import com.dotmarketing.exception.InvalidLicenseException;
+import com.dotmarketing.exception.WebAssetException;
+import com.dotmarketing.factories.*;
 import com.dotmarketing.portlets.containers.business.ContainerAPI;
 import com.dotmarketing.portlets.containers.model.Container;
 import com.dotmarketing.portlets.contentlet.business.HostAPI;
@@ -31,7 +47,13 @@
 import com.dotmarketing.portlets.templates.model.FileAssetTemplate;
 import com.dotmarketing.portlets.templates.model.SystemTemplate;
 import com.dotmarketing.portlets.templates.model.Template;
-import com.dotmarketing.util.*;
+import com.dotmarketing.util.ActivityLogger;
+import com.dotmarketing.util.Constants;
+import com.dotmarketing.util.InodeUtils;
+import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.PaginatedArrayList;
+import com.dotmarketing.util.UtilMethods;
+import com.dotmarketing.util.WebKeys;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.liferay.portal.model.User;
@@ -42,10 +64,23 @@
 import java.net.URL;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.dotmarketing.business.PermissionAPI.PERMISSION_EDIT;
 import static com.dotmarketing.business.PermissionAPI.PERMISSION_PUBLISH;
 
+/**
+ * This implementation of the {@link TemplateAPI} class provides the business logic to manage
+ * information related to Templates in dotCMS.
+ * <p>Templates are layouts available to users when building new HTML, xHTML or XML pages. Each
+ * Template includes one or more Containers, which act as server-side includes. The Containers
+ * placed in the Template define the areas on a Page that "permissioned" users will be able to
+ * contribute content to, and how that content will be displayed. Templates provide a page layout,
+ * and link the Containers to the page.</p>
+ *
+ * @author root
+ * @since Mar 22nd, 2012
+ */
 public class TemplateAPIImpl extends BaseWebAssetAPI implements TemplateAPI, DotInitializer {
 
 	private static final String LAYOUT_FILE_NAME     = "com/dotmarketing/portlets/templates/business/layout.json";
@@ -54,10 +89,13 @@ public class TemplateAPIImpl extends BaseWebAssetAPI implements TemplateAPI, Dot
 	private final  IdentifierAPI    identifierAPI          = APILocator.getIdentifierAPI();
 	private final  TemplateFactory  templateFactory        = FactoryLocator.getTemplateFactory();
 	private final  ContainerAPI     containerAPI           = APILocator.getContainerAPI();
-	private final  Lazy<VersionableAPI> versionableAPI     = Lazy.of(()->APILocator.getVersionableAPI());
-	private final  Lazy<HTMLPageAssetAPI> htmlPageAssetAPI = Lazy.of(()->APILocator.getHTMLPageAssetAPI());
+	private final  Lazy<VersionableAPI> versionableAPI     = Lazy.of(APILocator::getVersionableAPI);
+	private final  Lazy<HTMLPageAssetAPI> htmlPageAssetAPI = Lazy.of(APILocator::getHTMLPageAssetAPI);
 	private final  HostAPI          hostAPI                = APILocator.getHostAPI();
-	private final  Lazy<Template>   systemTemplate         = Lazy.of(() -> new SystemTemplate());
+	private final  Lazy<Template>   systemTemplate         = Lazy.of(SystemTemplate::new);
+
+	private final transient MultiTreeAPI multiTreeAPI = APILocator.getMultiTreeAPI();
+
 
 	@Override
 	public Template systemTemplate() {
@@ -146,7 +184,7 @@ public List<Template> findTemplatesAssignedTo(final Host parentHost) throws DotD
 	public List<Template> findTemplatesAssignedTo(final Host parentHost, final boolean includeArchived) throws DotDataException {
 
 		Logger.debug(this, ()-> "Calling findTemplatesAssignedTo for the host: " + parentHost.getHostname()
-							+ ", includeArchived: " + includeArchived);
+				+ ", includeArchived: " + includeArchived);
 
 		return Host.SYSTEM_HOST.equals(parentHost.getIdentifier())?
 				includeSystemTemplate(FactoryLocator.getTemplateFactory().findTemplatesAssignedTo(parentHost, includeArchived)):
@@ -187,7 +225,7 @@ public Template copy(final Template sourceTemplate, final User user) throws DotD
 	@WrapInTransaction
 	@Override
 	public Template copy(final Template sourceTemplate, final Host destination, final boolean forceOverwrite, final List<ContainerRemapTuple> containerMappings, final User user,
-			final boolean respectFrontendRoles)
+						 final boolean respectFrontendRoles)
 			throws DotDataException, DotSecurityException {
 
 		Logger.debug(this, ()-> "Calling copy template for the user: " + user.getUserId()
@@ -243,7 +281,7 @@ public Template copy(final Template sourceTemplate, final Host destination, fina
 
 		APILocator.getVersionableAPI().setWorking(newTemplate);
 		if(sourceTemplate.isLive()){
-		    APILocator.getVersionableAPI().setLive(newTemplate);
+			APILocator.getVersionableAPI().setLive(newTemplate);
 		} else if(sourceTemplate.isArchived()) {
 			APILocator.getVersionableAPI().setDeleted(newTemplate, true);
 		}
@@ -259,7 +297,7 @@ public Template copy(final Template sourceTemplate, final Host destination, fina
 	@Override
 	@WrapInTransaction
 	public Template copy(final Template sourceTemplate, final Host destination, final boolean forceOverwrite,
-			final boolean copySourceContainers, User user, final boolean respectFrontendRoles) throws DotDataException,
+						 final boolean copySourceContainers, User user, final boolean respectFrontendRoles) throws DotDataException,
 			DotSecurityException {
 
 		Logger.debug(this, ()-> "Calling copy template for the user: " + user.getUserId()
@@ -547,25 +585,30 @@ public void deleteTemplate(final Template template, final User user, final boole
 
 		Logger.debug(this, ()-> "Doing delete of the template: " + template.getIdentifier());
 
-		//Check Edit Permissions over Template
-		if(!this.permissionAPI.doesUserHavePermission(template, PERMISSION_EDIT, user)){
-			Logger.error(this,"The user: " + user.getUserId() + " does not have Permissions to Edit the Template");
-			throw new DotSecurityException("User does not have Permissions to Edit the Template");
+		// Check Edit Permissions over Template
+		if (!this.permissionAPI.doesUserHavePermission(template, PERMISSION_EDIT, user)) {
+			final String errorMsg = String.format("User '%s' does not have permission to delete Template " +
+					"'%s' [ %s ]", user.getUserId(), template.getName(), template.getInode());
+			Logger.error(this, errorMsg);
+			throw new DotSecurityException(errorMsg);
 		}
 
-		//Check that the template is archived
-		if(!isArchived(template)) {
-			Logger.error(this,"The template: " + template.getIdentifier() + " must be archived before it can be deleted");
-			throw new DotStateException("Template must be archived before it can be deleted");
+		// Check that the template is archived
+		if (!isArchived(template)) {
+			final String errorMsg = String.format("Template '%s' [ %s ] must be archived before it can be deleted",
+					template.getName(), template.getInode());
+			Logger.error(this, errorMsg);
+			throw new DotStateException(errorMsg);
 		}
 
-		//Check that template do not have dependencies (pages referencing the template),
-		// use system user b/c user executing the delete could no have access to all pages
+		// Check that template does not have pages referencing it
+		// use system user b/c the user executing this method might not have access to all pages
 		final Map<String,String> checkDependencies = checkPageDependencies(template,APILocator.systemUser(),false);
-		if(checkDependencies!= null && !checkDependencies.isEmpty()){
-			Logger.error(this, "The Template: " + template.getName() + " can not be deleted. "
-					+ "Because it has pages referencing to it: " + checkDependencies);
-			throw new DotDataValidationException("Template still has pages referencing to it: " + checkDependencies);
+		if (checkDependencies != null && !checkDependencies.isEmpty()) {
+			final String errorMsg = String.format("Template '%s' [ %s ] cannot be deleted because it still has pages referencing it: " +
+					"%s", template.getName(), template.getInode(), checkDependencies);
+			Logger.error(this, errorMsg);
+			throw new DotDataValidationException(errorMsg);
 		}
 
 		deleteTemplate(template);
@@ -628,7 +671,7 @@ public void deleteVersionByInode(final String inode) {
 	@Override
 	@WrapInTransaction
 	public Template saveDraftTemplate(final Template template, final Host host, final User user,
-                                      final boolean respectFrontendRoles) throws DotDataException, DotSecurityException {
+									  final boolean respectFrontendRoles) throws DotDataException, DotSecurityException {
 
 		if(Template.SYSTEM_TEMPLATE.equals(template.getIdentifier())) {
 
@@ -637,48 +680,48 @@ public Template saveDraftTemplate(final Template template, final Host host, fina
 
 		if (UtilMethods.isSet(template.getInode()) && UtilMethods.isSet(template.getIdentifier())) {
 
-            final Identifier identifier = APILocator.getIdentifierAPI().find(template.getIdentifier());
-            if (identifier != null && UtilMethods.isSet(identifier.getId())) {
+			final Identifier identifier = APILocator.getIdentifierAPI().find(template.getIdentifier());
+			if (identifier != null && UtilMethods.isSet(identifier.getId())) {
 
-                this.checkTemplate(template);
+				this.checkTemplate(template);
 
-                if (!permissionAPI.doesUserHavePermission(template, PERMISSION_EDIT, user, respectFrontendRoles)) {
-                    throw new DotSecurityException("You don't have permission to edit the template.");
-                }
+				if (!permissionAPI.doesUserHavePermission(template, PERMISSION_EDIT, user, respectFrontendRoles)) {
+					throw new DotSecurityException("You don't have permission to edit the template.");
+				}
 
-                if (template.isDrawed() && !UtilMethods.isSet(template.getDrawedBody())) {
-                    throw new DotStateException("Drawed template MUST have a drawed body:" + template);
-                }
+				if (template.isDrawed() && !UtilMethods.isSet(template.getDrawedBody())) {
+					throw new DotStateException("Drawed template MUST have a drawed body:" + template);
+				}
 
-                if (UtilMethods.isSet(template.getTheme())) {
+				if (UtilMethods.isSet(template.getTheme())) {
 
-                    this.setThemeName(template, user, respectFrontendRoles);
-                }
+					this.setThemeName(template, user, respectFrontendRoles);
+				}
 
-                final Template workingTemplate =
-                        this.findWorkingTemplate(template.getIdentifier(), user, respectFrontendRoles);
-                // Only draft if there is a working version that is not live
-                // and always create a new version if the user is different
-                if (null != workingTemplate &&
-                        !workingTemplate.isLive() && workingTemplate.getModUser().equals(user.getUserId())) {
+				final Template workingTemplate =
+						this.findWorkingTemplate(template.getIdentifier(), user, respectFrontendRoles);
+				// Only draft if there is a working version that is not live
+				// and always create a new version if the user is different
+				if (null != workingTemplate &&
+						!workingTemplate.isLive() && workingTemplate.getModUser().equals(user.getUserId())) {
 
-                    template.setModDate(new Date());
-                    // if we are the latest and greatest and are a draft
-                    if (!workingTemplate.getInode().equals(template.getInode())) {
+					template.setModDate(new Date());
+					// if we are the latest and greatest and are a draft
+					if (!workingTemplate.getInode().equals(template.getInode())) {
 
-                        template.setInode(workingTemplate.getInode());
-                    }
+						template.setInode(workingTemplate.getInode());
+					}
 
-                    this.templateFactory.save(template, template.getInode());
-                    templateFactory.deleteFromCache(workingTemplate);
+					this.templateFactory.save(template, template.getInode());
+					templateFactory.deleteFromCache(workingTemplate);
 
-                    return template;
-                }
-            }
-        }
+					return template;
+				}
+			}
+		}
 
-        // if identifier do not exists, save new version
-        return this.saveTemplate(template, host, user, respectFrontendRoles);
+		// if identifier do not exists, save new version
+		return this.saveTemplate(template, host, user, respectFrontendRoles);
 
 	}
 
@@ -689,9 +732,9 @@ public void setThemeName (final Template template, final User user, final boolea
 
 		if(null != theme && InodeUtils.isSet(theme.getInode())) {
 
-            template.setThemeName(theme.getName());
-        }
-    }
+			template.setThemeName(theme.getName());
+		}
+	}
 
 	@Override
 	@WrapInTransaction
@@ -709,12 +752,12 @@ public Template saveTemplate(final Template template, final Host host, final Use
 		this.checkTemplate(template);
 
 		if(UtilMethods.isSet(template.getIdentifier())) {
-		    final Identifier ident=APILocator.getIdentifierAPI().find(template.getIdentifier());
-		    existingId = ident!=null && UtilMethods.isSet(ident.getId());
+			final Identifier ident=APILocator.getIdentifierAPI().find(template.getIdentifier());
+			existingId = ident!=null && UtilMethods.isSet(ident.getId());
 		}
 
-	    //if is an existing template check EDIT permissions, if is new template you need add_children and edit permissions over the host
-	    if(existingId){
+		//if is an existing template check EDIT permissions, if is new template you need add_children and edit permissions over the host
+		if(existingId){
 			if (!permissionAPI.doesUserHavePermission(template, PERMISSION_EDIT, user, respectFrontendRoles)) {
 
 				Logger.error(this, "You don't have permission to edit the template.");
@@ -734,14 +777,14 @@ public Template saveTemplate(final Template template, final Host host, final Use
 			}
 		}
 
-	    if(template.isDrawed() && !UtilMethods.isSet(template.getDrawedBody())) {
+		if(template.isDrawed() && !UtilMethods.isSet(template.getDrawedBody())) {
 
 			Logger.error(this, "Drawed template MUST have a drawed body:" + template);
-	        throw new DotStateException("Drawed template MUST have a drawed body:" + template);
-	    }
+			throw new DotStateException("Drawed template MUST have a drawed body:" + template);
+		}
 
 		if(UtilMethods.isSet(template.getTheme())) {
-            this.setThemeName(template, user, respectFrontendRoles);
+			this.setThemeName(template, user, respectFrontendRoles);
 		}
 
 		if (existingId) {
@@ -761,7 +804,7 @@ public Template saveTemplate(final Template template, final Host host, final Use
 		save(template);
 		APILocator.getVersionableAPI().setWorking(template);
 
-        return template;
+		return template;
 	}
 
 	private void checkTemplate(final Template template) throws DotDataException {
@@ -780,19 +823,19 @@ private void checkTemplate(final Template template) throws DotDataException {
 	}
 
 	@CloseDBIfOpened
-    @Override
-    public List<Container> getContainersInTemplate(final Template template, final User user, final boolean respectFrontendRoles)
-            throws DotDataException, DotSecurityException {
+	@Override
+	public List<Container> getContainersInTemplate(final Template template, final User user, final boolean respectFrontendRoles)
+			throws DotDataException, DotSecurityException {
 
 		Logger.debug(this, ()-> "Calling getContainersInTemplate: template: " + template.getIdentifier());
 		if (Template.SYSTEM_TEMPLATE.equals(template.getIdentifier())) {
 			return new ImmutableList.Builder<Container>().add(this.containerAPI.systemContainer()).build();
 		}
 
-        final List<Container> containers = new ArrayList<>();
-        if(template.isDrawed()) {
-            final TemplateLayout layout = DotTemplateTool.themeLayout(template.getInode());
-            if (layout != null) {
+		final List<Container> containers = new ArrayList<>();
+		if(template.isDrawed()) {
+			final TemplateLayout layout = DotTemplateTool.themeLayout(template.getInode());
+			if (layout != null) {
 				final List<String> containersId = this.getContainersId(layout);
 
 				for (final String containerIdOrPath : containersId) {
@@ -806,7 +849,7 @@ public List<Container> getContainersInTemplate(final Template template, final Us
 					containers.add(optionalContainer.get());
 				}
 			}
-        } else {//only do this if is not drawed
+		} else {//only do this if is not drawed
 
 			final Set<ContainerUUID> containerUUIDSet = APILocator.getTemplateAPI().getContainersUUIDFromDrawTemplateBody(
 					template.getBody()).stream().collect(Collectors.toSet());
@@ -818,12 +861,12 @@ public List<Container> getContainersInTemplate(final Template template, final Us
 				}
 			}
 		}
-        return containers.stream().distinct().collect(Collectors.toList());
+		return containers.stream().distinct().collect(Collectors.toList());
 
-    }
+	}
 
 	@CloseDBIfOpened
-    @Override
+	@Override
 	public List<ContainerUUID> getContainersUUID(final TemplateLayout layout) {
 
 		Logger.debug(this, ()-> "Calling getContainersInTemplate: layout: " + layout.getLayout());
@@ -945,12 +988,12 @@ public Template findWorkingTemplate(final String id, final User user, final bool
 	@Override
 	@CloseDBIfOpened
 	public List<Template> findTemplates(final User user, final boolean includeArchived,
-			final Map<String, Object> params, final String hostId, final String inode, final String identifier, final String parent,
-			final int offset, final int limit, final String orderBy) throws DotSecurityException,
+										final Map<String, Object> params, final String hostId, final String inode, final String identifier, final String parent,
+										final int offset, final int limit, final String orderBy) throws DotSecurityException,
 			DotDataException {
 
 		Logger.debug(this, ()->"Calling findTemplates, params " + params + ", user:" + user.getUserId() +
-						", inode = " + inode + ", id: " + identifier + ", parent: " + parent);
+				", inode = " + inode + ", id: " + identifier + ", parent: " + parent);
 		return  offset == 0 && !includeArchived? // if it is the first page and do not include archived, include the system template
 				this.includeSystemTemplate(templateFactory.findTemplates(user, includeArchived, params, hostId, inode, identifier, parent, offset, limit, orderBy)):
 				this.templateFactory.findTemplates(user, includeArchived, params, hostId, inode, identifier, parent, offset, limit, orderBy);
@@ -971,7 +1014,7 @@ public Template find(final String inode, final User user, final boolean respectF
 		final Template template =  templateFactory.find(inode);
 
 		if(template!=null && InodeUtils.isSet(template.getInode()) &&
-		      !permissionAPI.doesUserHavePermission(template, PermissionAPI.PERMISSION_READ, user, respectFrontEndRoles)) {
+				!permissionAPI.doesUserHavePermission(template, PermissionAPI.PERMISSION_READ, user, respectFrontEndRoles)) {
 
 			Logger.error(this, "User does not have access to template:" + inode);
 			throw new DotSecurityException("User does not have access to template:" + inode);
@@ -1013,7 +1056,7 @@ public String checkDependencies(final String templateInode, final User user, fin
 
 		// todo: do something for the system template
 		Logger.debug(this, ()-> "Calling check Dependencies, templateInode: " + templateInode +
-								", user: " + user.getUserId());
+				", user: " + user.getUserId());
 
 		String result = null;
 		final Template template = find(templateInode, user, respectFrontendRoles);
@@ -1058,7 +1101,7 @@ public Map<String, String> checkPageDependencies(final Template template, final
 
 				final HTMLPageAsset pageAsset = this.htmlPageAssetAPI.get().fromContentlet(page);
 				final Host host               = Try.of(()->this.hostAPI.find(pageAsset.getHost(), user, false))
-													.getOrElseThrow(e -> new RuntimeException(e));
+						.getOrElseThrow(e -> new RuntimeException(e));
 
 				resultMapBuilder.put(template.getName(), host.getHostname() + ":" +
 						Try.of(()->pageAsset.getURI()).getOrElseThrow(e -> new RuntimeException(e)));
@@ -1068,25 +1111,25 @@ public Map<String, String> checkPageDependencies(final Template template, final
 		return resultMapBuilder.build();
 	}
 
-    @Override
-    public int deleteOldVersions(final Date assetsOlderThan) throws DotStateException, DotDataException {
+	@Override
+	public int deleteOldVersions(final Date assetsOlderThan) throws DotStateException, DotDataException {
 
 		Logger.debug(this, ()-> "Calling deleteOldVersions, assetsOlderThan: " + assetsOlderThan);
-        return deleteOldVersions(assetsOlderThan,"template");
-    }
+		return deleteOldVersions(assetsOlderThan,"template");
+	}
 
-    @WrapInTransaction
+	@WrapInTransaction
 	@Override
-    public void updateThemeWithoutVersioning(final String templateInode, final String theme) throws DotDataException{
+	public void updateThemeWithoutVersioning(final String templateInode, final String theme) throws DotDataException{
 
 		Logger.debug(this, ()-> "Calling updateThemeWithoutVersioning, templateInode: " + templateInode +
-									", theme = " + theme);
-    	templateFactory.updateThemeWithoutVersioning(templateInode, theme);
-    }
+				", theme = " + theme);
+		templateFactory.updateThemeWithoutVersioning(templateInode, theme);
+	}
 
-    /**
+	/**
 	 * Method will replace user references of the given userId in templates
-	 * with the replacement user Id  
+	 * with the replacement user Id
 	 * @param userId User Identifier
 	 * @param replacementUserId The user id of the replacement user
 	 * @throws DotDataException There is a data inconsistency
@@ -1187,10 +1230,10 @@ public void setLive(final Template template) throws DotDataException, DotStateEx
 	@Override
 	@CloseDBIfOpened
 	public Template getTemplateByFolder(final Folder folder, final Host host, final User user,
-			final boolean showLive) throws DotSecurityException, DotDataException {
+										final boolean showLive) throws DotSecurityException, DotDataException {
 
 		Logger.debug(this, ()-> "Calling getTemplateByFolder, folder: " + folder.getIdentifier()
-							+ ", host: " + host.getHostname());
+				+ ", host: " + host.getHostname());
 
 		return templateFactory.getTemplateByFolder(host,folder,user,showLive);
 	}
@@ -1207,6 +1250,252 @@ public List<HTMLPageVersion> getPages(final String templateId) throws DotDataExc
 		return FactoryLocator.getTemplateFactory().getPages(templateId);
 	}
 
+	/**
+	 * Default implementation for {@link TemplateAPI#saveAndUpdateLayout(Template, TemplateLayout, Host, User, boolean)}
+	 *
+	 * @param template
+	 * @param layout
+	 * @param site
+	 * @param user
+	 * @param respectFrontendRoles
+	 * @return
+	 * @throws DotDataException
+	 * @throws DotSecurityException
+	 */
+	@Override
+	public Template saveAndUpdateLayout(final Template template, final TemplateLayout layout, final Host site,
+										final User user, final boolean respectFrontendRoles)
+			throws DotDataException, DotSecurityException {
+
+		final Template templateFromDB = UtilMethods.isSet(template.getIdentifier()) ?
+				APILocator.getTemplateAPI().findWorkingTemplate(template.getIdentifier(), user, false)
+				: null;
+
+		if (templateFromDB != null) {
+			final TemplateLayout templateLayoutFromDB = DotTemplateTool.getTemplateLayout(templateFromDB.getDrawedBody());
+
+			LayoutChanges changes = getChange(templateLayoutFromDB, layout);
+
+			final List<String> pageIds = APILocator.getHTMLPageAssetAPI().findPagesByTemplate(template, user, respectFrontendRoles)
+					.stream()
+					.map(Contentlet::getIdentifier)
+					.collect(Collectors.toList());
+
+			multiTreeAPI.updateMultiTrees(changes, pageIds);
+		}
+
+		template.setDrawedBody(reOrder(layout));
+		template.setDrawed(true);
+
+		return saveTemplate(template, site, user, respectFrontendRoles);
+	}
+
+	/**
+	 * Recalculate the UUID for the layout, it means if the layout is something like
+	 *
+	 * <code>
+	 * Row 1:
+	 * 	Column 1:
+	 * 		Container A UUID = 2
+	 * 	Column 2:
+	 * 		Container A UUID = -1
+	 * Row 2:
+	 * 	Column1:
+	 * 	   Container A UUID= 1
+	 * </code>
+	 * The UUID are not in the right sequential order so this method is going to return the follow:
+	 *
+	 * <code>
+	 * Row 1:
+	 * 	Column 1:
+	 * 		Container A UUID = 1
+	 * 	Column 2:
+	 * 		Container A UUID = 2
+	 * Row 2:
+	 * 	Column1:
+	 * 	   Container A UUID= 3
+	 * </code>
+	 *
+	 * @param layout
+	 * @return
+	 */
+	private TemplateLayout reOrder(final TemplateLayout layout) {
+		final List<ContainerUUID> containers = getContainers(layout);
+
+		final Map<String,Integer> uuidByContainer = new HashMap<>();
+
+		containers.stream().forEach(containerUUID -> {
+			Integer maxUUID = uuidByContainer.get(containerUUID.getIdentifier());
+
+			if (maxUUID == null) {
+				maxUUID = 1;
+			} else {
+				maxUUID++;
+			}
+
+			uuidByContainer.put(containerUUID.getIdentifier(), maxUUID);
+
+			containerUUID.setUuid(maxUUID.toString());
+		});
+
+		return layout;
+	}
+
+	/**
+	 * Return all the changes between the OldLayout and the newLayout.
+	 *
+	 * To match the Container Instance between the two layouts it used the Container's ID and the Container UUID,
+	 * so if a Container that had the same ID and UUID are in a different position on the two Layout then it means that
+	 * the Container was moved.
+	 *
+	 * If a new Container instances is add on the newLayout then the UUID is -1, it means this instances does not exist
+	 * on the oldLayout.
+	 *
+	 *
+	 * for example if we have
+	 *
+	 * oldLayout:
+	 * <code>
+	 * Row 1:
+	 * 	Column 1:
+	 * 		Container A UUID = 1
+	 * 	Column 2:
+	 * 		Container A UUID = 2
+	 * Row 2:
+	 * 	Column1:
+	 * 	   Container A UUID= 3
+	 * </code>
+	 *
+	 * And newLayout is
+	 *
+	 * <code>
+	 * Row 1:
+	 *   Column 1:
+	 *     Container A UUID = -1
+	 * Row 2:
+	 * 	Column1:
+	 * 	   Container A UUID= 3
+	 * Row 3:
+	 * 	Column 1:
+	 * 		Container A UUID = 1
+	 * </code>
+	 * A -1 UUID means that this is a new Container, with the 2 layouts of the example this method is going to return:
+	 *
+	 * <code>
+	 * Row 1:
+	 *   Column 1:
+	 *     Container A OLD_UUID = -1 (IS NEW) NEW_UUID = 1
+	 * Row 2:
+	 * 	Column1:
+	 * 	   Container A OLD_UUID = 3  NEW_UUID = 2 (WAS MOVED)
+	 * Row 3:
+	 * 	Column 1:
+	 * 		Container OLD_UUID = 1  NEW_UUID = 3 (WAS MOVED)
+	 *
+	 * 	finally:
+	 *
+	 * 	Container OLD_UUID = 2  (WAS DELETED)
+	 * </code>
+	 * @param oldLayout
+	 * @param newLayout
+	 * @return
+	 */
+	private LayoutChanges getChange(final TemplateLayout oldLayout, final TemplateLayout newLayout) {
+		final LayoutChanges.Builder builder = new LayoutChanges.Builder();
+
+		final List<ContainerUUID> newContainers = getContainers(newLayout);
+
+		addMoveAndNewChanges(newContainers, builder);
+		addRemoveChanges(oldLayout, newContainers, builder);
+
+		return builder.build();
+	}
+
+	/**
+	 * Add Move/Include changes inside the LayoutChanges.Builder, following these rules:
+	 *
+	 * - The ContainersUUID must be in sequential order. If not:
+	 * If the UUID of the Container is -1, a new included change is added to the LayoutChange.Builder.
+	 * The oldUUID is the UUID that should be according to its order in newContainers.
+	 *
+	 * If the UUID is not in the right order, a new move change is added to the LayoutChange.Builder.
+	 * The oldUUID is the UUID that has the ContainerUUID, and the newUUID is the UUID that should be according to its order in newContainers.
+	 *
+	 * @param newContainers
+	 * @param builder
+	 */
+	private static void addMoveAndNewChanges(List<ContainerUUID> newContainers, LayoutChanges.Builder builder) {
+		final Map<String,Integer> uuidByContainer = new HashMap<>();
+
+		newContainers.stream().forEach(newContainer -> {
+			Integer maxUUID = uuidByContainer.get(newContainer.getIdentifier());
+
+			if (maxUUID == null) {
+				maxUUID = 1;
+			} else {
+				maxUUID++;
+			}
+
+			uuidByContainer.put(newContainer.getIdentifier(), maxUUID);
+
+			if (newContainer.getUUID().equals(ContainerUUID.UUID_DEFAULT_VALUE)) {
+				builder.include(newContainer.getIdentifier(), String.valueOf(maxUUID));
+			} else if (!newContainer.getUUID().equals(maxUUID.toString())) {
+				builder.change(newContainer.getIdentifier(), newContainer.getUUID(), String.valueOf(maxUUID));
+			}
+		});
+	}
+
+	/**
+	 * Add Removed changes inside the LayoutChanges.Builder, following these rules:
+	 *
+	 * - The ContainersUUID must be in sequential order. If not:
+	 * If the sequential order has a blank spot then, a new removed change is added to the LayoutChange.Builder.
+	 * The oldUUID is the UUID that should be according to its order in newContainers.
+	 *
+	 * @param newContainers
+	 * @param builder
+	 */
+	private static void addRemoveChanges(TemplateLayout oldLayout, List<ContainerUUID> newContainers,
+										 LayoutChanges.Builder builder) {
+		final List<ContainerUUID> oldContainers = getContainers(oldLayout);
+
+		oldContainers.stream().forEach(oldContainer -> {
+			Optional<ContainerUUID> newContainer = newContainers.stream()
+					.filter(containerUUID -> containerUUID.getIdentifier().equals(oldContainer.getIdentifier()))
+					.filter(containerUUID -> containerUUID.getUUID().equals(oldContainer.getUUID()))
+					.findFirst();
+
+			if (!newContainer.isPresent()) {
+				builder.remove(oldContainer.getIdentifier(), oldContainer.getUUID());
+			}
+		});
+	}
+
+	/**
+	 * Get all the {@link ContainerUUID} from the {@link TemplateLayout}
+	 * @param layout
+	 * @return
+	 */
+	private static List<ContainerUUID> getContainers(TemplateLayout layout) {
+
+		if (!UtilMethods.isSet(layout)) {
+			return Collections.emptyList();
+		}
+
+		final List<ContainerUUID> bodyContainers = layout.getBody().getRows().stream()
+				.flatMap(row -> row.getColumns().stream())
+				.flatMap(column -> column.getContainers().stream())
+				.collect(Collectors.toList());
+
+		final Sidebar sidebar = layout.getSidebar();
+
+		final List<ContainerUUID> sidebarContainers = sidebar != null ? sidebar.getContainers() : Collections.emptyList();
+
+		return Stream.concat(bodyContainers.stream(), sidebarContainers.stream())
+				.collect(Collectors.toList());
+	}
+
 	private Template findTemplateByPath (final String path,final String hostId, final User user, final boolean respectFrontendRoles, final boolean showLive) throws DotDataException, DotSecurityException {
 
 		final FileAssetTemplateUtil fileAssetTemplateUtil =
@@ -1264,4 +1553,4 @@ public void onCopySite(final SiteCreatedEvent event)
 		APILocator.getFolderAPI().subscribeFolderListener(appTemplateFolder, new ApplicationTemplateFolderListener(),
 				childName -> null != childName && (childName.endsWith(Constants.VELOCITY_FILE_EXTENSION) || childName.endsWith(Constants.JSON_FILE_EXTENSION)));
 	}
-}
+}
\ No newline at end of file
diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/design/bean/LayoutChanges.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/design/bean/LayoutChanges.java
new file mode 100644
index 000000000000..276dd71a1b10
--- /dev/null
+++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/design/bean/LayoutChanges.java
@@ -0,0 +1,106 @@
+package com.dotmarketing.portlets.templates.design.bean;
+
+import com.dotcms.rest.api.v1.workflow.SchemesAndSchemesContentTypeView;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Represents a set of changes apply to a {@link TemplateLayout}
+ */
+public class LayoutChanges {
+
+    private Collection<ContainerChanged> changes = new ArrayList<>();
+
+    private LayoutChanges(Builder builder) {
+        this.changes = builder.changes;
+    }
+
+    /**
+     * Get all the changes
+     * @return
+     */
+    public Collection<ContainerChanged> getAll() {
+        return changes;
+    }
+
+    public static class Builder {
+
+        private Collection<ContainerChanged> changes = new ArrayList<>();
+
+        /**
+         * Add a move change on the set, it means a Container was moved from a old UUID to a new UUID
+         *
+         * @param containerId  Container's ID
+         * @param oldIntanceId Old UUID
+         * @param newIntanceId New UUID
+         */
+        public Builder change(final String containerId, final String oldIntanceId, final String newIntanceId) {
+            changes.add(new ContainerChanged(containerId, oldIntanceId, newIntanceId));
+            return this;
+        }
+
+
+        /**
+         * Add a remove change on the set, it means a Container was removed from the Layout
+         *
+         * @param containerId  Container's ID
+         * @param oldIntanceId Old UUID
+         */
+        public Builder remove(final String containerId, final String oldIntanceId) {
+            changes.add(new ContainerChanged(containerId, oldIntanceId, ContainerUUID.UUID_DEFAULT_VALUE));
+            return this;
+        }
+
+        /**
+         * Add a included change on the set, it means that a Container was removed from the Layout
+         *
+         * @param containerId
+         * @param newIntanceId
+         */
+        public Builder include(final String containerId, final String newIntanceId) {
+            changes.add(new ContainerChanged(containerId, ContainerUUID.UUID_DEFAULT_VALUE, newIntanceId));
+            return this;
+        }
+        public LayoutChanges build() {
+            return new LayoutChanges(this);
+        }
+    }
+
+    public static class ContainerChanged {
+        private String containerId;
+        private String newInstanceId;
+        private String oldInstanceId;
+
+        public ContainerChanged(String containerId,  String oldInstanceId, String newInstanceId) {
+            this.containerId = containerId;
+            this.newInstanceId = newInstanceId;
+            this.oldInstanceId = oldInstanceId;
+        }
+
+        public String getContainerId() {
+            return containerId;
+        }
+
+        public String getNewInstanceId() {
+            return newInstanceId;
+        }
+
+        public String getOldInstanceId() {
+            return oldInstanceId;
+        }
+
+        public boolean isRemove() {
+            return ContainerUUID.UUID_DEFAULT_VALUE.equals(newInstanceId);
+        }
+
+        public boolean isNew() {
+            return ContainerUUID.UUID_DEFAULT_VALUE.equals(oldInstanceId);
+        }
+
+        public boolean isMoved() {
+            return !ContainerUUID.UUID_DEFAULT_VALUE.equals(newInstanceId) &&
+                    !ContainerUUID.UUID_DEFAULT_VALUE.equals(oldInstanceId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/design/bean/TemplateLayout.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/design/bean/TemplateLayout.java
index a32b6afbc789..87aa057fb3c3 100644
--- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/design/bean/TemplateLayout.java
+++ b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/design/bean/TemplateLayout.java
@@ -17,6 +17,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -187,6 +188,19 @@ public String toString() {
         }
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TemplateLayout that = (TemplateLayout) o;
+        return toString().equals(that.toString());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(toString());
+    }
+
     /**
      * Return true if the container exists into the TemplateLayout
      *