diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java b/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
index 128fad10d6..f933e2eaa1 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
@@ -155,7 +155,8 @@ public List renderExecutionPlan( final Stack executionStack )
                 List newRendered = new ArrayList( bindingsToAdd );
 
                 // if we've already executed part of the lifecycle, just continue with the new bindings.
-                if ( ( renderedLifecycleMojos != null ) && ( renderedLifecycleMojos.size() < bindingsToAdd.size() ) )
+                if ( ( renderedLifecycleMojos != null ) && ( renderedLifecycleMojos.size() < bindingsToAdd.size() )
+                     && bindingsToAdd.containsAll( renderedLifecycleMojos ) )
                 {
                     bindingsToAdd = bindingsToAdd.subList( renderedLifecycleMojos.size(), bindingsToAdd.size() );
                 }
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java b/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
index d7e2b43093..d7bcb1e5f9 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
@@ -71,6 +71,7 @@ private void initializeDirectInvocations( final BuildPlan plan, final MavenProje
         throws LifecycleSpecificationException, LifecycleLoaderException
     {
         List tasks = plan.getTasks();
+
         for ( Iterator it = tasks.iterator(); it.hasNext(); )
         {
             String task = (String) it.next();
diff --git a/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo b/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
index 87ff3a7383..3013f7b15c 100644
--- a/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
+++ b/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
@@ -564,6 +564,7 @@
         <field>
           <name>groupId</name>
           <required>true</required>
+          <identifier>true</identifier>
           <version>1.0.0</version>
           <description>Plugin's groupId.</description>
           <type>String</type>
@@ -571,6 +572,7 @@
         <field>
           <name>artifactId</name>
           <required>true</required>
+          <identifier>true</identifier>
           <version>1.0.0</version>
           <description>Plugin's artifactId.</description>
           <type>String</type>
@@ -585,6 +587,7 @@
         <field>
           <name>goal</name>
           <required>true</required>
+          <identifier>true</identifier>
           <version>1.0.0</version>
           <description>Mojo's goal name.</description>
           <type>String</type>
@@ -592,6 +595,7 @@
         <field>
           <name>executionId</name>
           <version>1.0.0</version>
+          <identifier>true</identifier>
           <defaultValue>default</defaultValue>
           <description>A name for this mojo binding, for purposes of merging configurations via inheritance, etc.</description>
           <type>String</type>
@@ -615,6 +619,7 @@
           <type>boolean</type>
         </field>
       </fields>
+<!-- 
       <codeSegments>
         <codeSegment>
           <version>1.0.0</version>
@@ -627,6 +632,7 @@
           ]]></code>
         </codeSegment>
       </codeSegments>
+ -->
     </class>
   </classes>
 </model>