Fix issue MR-565 - Double Folder keep heritage on the initial Folder