Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r8aa0cdda5f051a040e7056fe49e0df00ea29ca9d -r870c266bfd1ee7264a30aa60c8556ac353aa1db9
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision 8aa0cdda5f051a040e7056fe49e0df00ea29ca9d)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision 870c266bfd1ee7264a30aa60c8556ac353aa1db9)
@@ -71,7 +71,7 @@
         }
 
         /// <summary>
-        /// Assembles the detailed assessment results.
+        /// Assembles the detailed assessment result.
         /// </summary>
         /// <param name="failureMechanismSectionResult">The failure mechanism section result to assemble the 
         /// detailed assembly results for.</param>
@@ -107,7 +107,7 @@
         }
 
         /// <summary>
-        /// Assembles the tailor made assessment results.
+        /// Assembles the tailor made assessment result.
         /// </summary>
         /// <param name="failureMechanismSectionResult">The failure mechanism section result to assemble the 
         /// tailor made assembly results for.</param>
@@ -139,7 +139,7 @@
         }
 
         /// <summary>
-        /// Assembles the combined assessment results.
+        /// Assembles the combined assembly.
         /// </summary>
         /// <param name="failureMechanismSectionResult">The failure mechanism section result to assemble the 
         /// combined assembly results for.</param>
@@ -185,19 +185,22 @@
         /// Gets the assembly category group of the given <paramref name="failureMechanismSectionResult"/>.
         /// </summary>
         /// <param name="failureMechanismSectionResult">The failure mechanism section result to get the assembly category group for.</param>
+        /// <param name="useManual">Indicator that determines whether the manual assembly should be used or ignored, regardless of
+        /// the value of <see cref="GrassCoverErosionOutwardsFailureMechanismSectionResult.UseManualAssemblyCategoryGroup"/>.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/> is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssemblyCategoryGroup GetSectionAssemblyCategoryGroup(
-            GrassCoverErosionOutwardsFailureMechanismSectionResult failureMechanismSectionResult)
+            GrassCoverErosionOutwardsFailureMechanismSectionResult failureMechanismSectionResult,
+            bool useManual)
         {
             if (failureMechanismSectionResult == null)
             {
                 throw new ArgumentNullException(nameof(failureMechanismSectionResult));
             }
 
-            return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
+            return failureMechanismSectionResult.UseManualAssemblyCategoryGroup && useManual
                        ? failureMechanismSectionResult.ManualAssemblyCategoryGroup
                        : AssembleCombinedAssessment(failureMechanismSectionResult);
         }
@@ -206,12 +209,15 @@
         /// Assembles the failure mechanism assembly.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to assemble for.</param>
+        /// <param name="useManual">Indicator that determines whether the manual assembly should be used or ignored, regardless of
+        /// the value of <see cref="GrassCoverErosionOutwardsFailureMechanismSectionResult.UseManualAssemblyCategoryGroup"/>.</param>
         /// <returns>A <see cref="FailureMechanismAssemblyCategoryGroup"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismAssemblyCategoryGroup"/>
         /// could not be created.</exception>
-        public static FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(GrassCoverErosionOutwardsFailureMechanism failureMechanism)
+        public static FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(GrassCoverErosionOutwardsFailureMechanism failureMechanism,
+                                                                                     bool useManual)
         {
             if (failureMechanism == null)
             {
@@ -226,7 +232,7 @@
             try
             {
                 IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
-                    failureMechanism.SectionResults.Select(GetSectionAssemblyCategoryGroup).ToArray();
+                    failureMechanism.SectionResults.Select(result => GetSectionAssemblyCategoryGroup(result, useManual)).ToArray();
 
                 IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
                 IFailureMechanismAssemblyCalculator calculator =