diff --git a/magnolia-core/src/main/java/info/magnolia/importexport/postprocessors/MetaDataAsMixinConversionHelper.java b/magnolia-core/src/main/java/info/magnolia/importexport/postprocessors/MetaDataAsMixinConversionHelper.java
index 93f169c..5aded8d 100644
--- a/magnolia-core/src/main/java/info/magnolia/importexport/postprocessors/MetaDataAsMixinConversionHelper.java
+++ b/magnolia-core/src/main/java/info/magnolia/importexport/postprocessors/MetaDataAsMixinConversionHelper.java
@@ -133,10 +133,15 @@
             }
 
             // Queue child nodes
+
             NodeIterator children = node.getNodes();
             while (children.hasNext()) {
                 Node child = children.nextNode();
-                if (!(child.getName().equals(MetaData.DEFAULT_META_NODE) && NodeUtil.isNodeType(child, NodeTypes.MetaData.NAME))) {
+                boolean ignore = child.getName().startsWith("jcr:") || child.getName().startsWith("rep:");
+                boolean isMetaData = child.getName().equals(MetaData.DEFAULT_META_NODE) && NodeUtil.isNodeType(child, NodeTypes.MetaData.NAME);
+                if (ignore || isMetaData) {
+                    continue;
+                } else {
                     nodes.add(child);
                 }
             }
diff --git a/magnolia-core/src/main/java/info/magnolia/setup/CoreModuleVersionHandler.java b/magnolia-core/src/main/java/info/magnolia/setup/CoreModuleVersionHandler.java
index b39a811..0a90e9b 100644
--- a/magnolia-core/src/main/java/info/magnolia/setup/CoreModuleVersionHandler.java
+++ b/magnolia-core/src/main/java/info/magnolia/setup/CoreModuleVersionHandler.java
@@ -136,12 +136,6 @@
 
     public CoreModuleVersionHandler() {
         super();
-
-        register(DeltaBuilder.update("5.0", "")
-                .addTask(new Register50NodeTypeTask("Register the new M5 node Type", "", RepositoryConstants.CONFIG))
-                .addTask(new RemoveMetaDataInNodeTypeDefinitionTask("Un register the metaData child node", "", RepositoryConstants.CONFIG))
-                .addTask(new ConvertMetaDataUpdateTask("", "")));
-
         register(DeltaBuilder.checkPrecondition("4.4.6", "4.5"));
 
         register(DeltaBuilder.update("4.5", "")
@@ -187,6 +181,10 @@
                 .addTask(new NodeExistsDelegateTask("AuditLogging configurations", "Add auditLogging configurations for delete action", "config", "/server/auditLogging/logConfigurations/delete", null, new PartialBootstrapTask("", "", "/mgnl-bootstrap/core/config.server.auditLogging.xml", "/auditLogging/logConfigurations/delete", ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW)))
                 .addTask(new CheckAndModifyPropertyValueTask("AuditLogging configurations", "Change auditLogging class", "config", "/server/auditLogging", "class", "info.magnolia.logging.AuditLoggingManager", "info.magnolia.audit.AuditLoggingManager"))
                 .addTask(updateSecurityBaseRole));
+        register(DeltaBuilder.update("5.0", "")
+                .addTask(new Register50NodeTypeTask("Register the new M5 node Type", "", RepositoryConstants.CONFIG))
+                .addTask(new RemoveMetaDataInNodeTypeDefinitionTask("Un register the metaData child node", "", RepositoryConstants.CONFIG))
+                .addTask(new ConvertMetaDataUpdateTask("Convert MetaData Task", "Remove the metaData sub node and replace them with mixIn when appropriate")));
         register((DeltaBuilder.update("5.0.1", ""))
                 .addTask(new CheckAndModifyPropertyValueTask("MIMEMapping", "Change xsl extension mime-type from text/xml to application/xml", RepositoryConstants.CONFIG, "/server/MIMEMapping/xsl", "mime-type", "text/xml", "application/xml"))
                 .addTask(new CheckAndModifyPropertyValueTask("MIMEMapping", "Change xml extension mime-type from text/xml to application/xml", RepositoryConstants.CONFIG, "/server/MIMEMapping/xml", "mime-type", "text/xml", "application/xml")));