Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs
===================================================================
diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -rf4f9469d89fb6c1d214d4478bcf39b70f88de3e0
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactory.cs)	(revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactory.cs)	(revision f4f9469d89fb6c1d214d4478bcf39b70f88de3e0)
@@ -62,7 +62,7 @@
                     failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod);
             }
 
-            FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism);
+            FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false);
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs
===================================================================
diff -u -rdfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56 -rf4f9469d89fb6c1d214d4478bcf39b70f88de3e0
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs	(.../ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs)	(revision dfe18c1eb7e5832aa59fe57b5fa2a09548cdaf56)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs	(.../ExportableWaveImpactAsphaltCoverFailureMechanismFactory.cs)	(revision f4f9469d89fb6c1d214d4478bcf39b70f88de3e0)
@@ -62,7 +62,7 @@
                     failureMechanismCode, failureMechanismGroup, failureMechanismAssemblyMethod);
             }
 
-            FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism);
+            FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false);
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs
===================================================================
diff -u -r23a944dbdd57753d15e0e0369a1a851bb83f60c8 -rf4f9469d89fb6c1d214d4478bcf39b70f88de3e0
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs	(.../ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs)	(revision 23a944dbdd57753d15e0e0369a1a851bb83f60c8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs	(.../ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs)	(revision f4f9469d89fb6c1d214d4478bcf39b70f88de3e0)
@@ -161,7 +161,7 @@
                 ExportableMacroStabilityOutwardsFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, new AssessmentSectionStub());
 
                 // Then
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.IIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.VIv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single());
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs
===================================================================
diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -rf4f9469d89fb6c1d214d4478bcf39b70f88de3e0
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs)	(revision 68318584c702cb11e38cd84a31d18c951595dda0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs)	(revision f4f9469d89fb6c1d214d4478bcf39b70f88de3e0)
@@ -114,6 +114,29 @@
             }
         }
 
+        [Test]
+        public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored()
+        {
+            // Given
+            var failureMechanism = new StabilityStoneCoverFailureMechanism();
+            FailureMechanismTestHelper.AddSections(failureMechanism, 1);
+            StabilityStoneCoverFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
+            sectionResult.UseManualAssemblyCategoryGroup = true;
+            sectionResult.ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.VIIv;
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
+
+                // When
+                ExportableStabilityStoneCoverFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism);
+
+                // Then
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.Iv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single());
+            }
+        }
+
         private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly,
                                                                            FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly,
                                                                            FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly,
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs
===================================================================
diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -rf4f9469d89fb6c1d214d4478bcf39b70f88de3e0
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs	(.../ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs)	(revision 68318584c702cb11e38cd84a31d18c951595dda0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs	(.../ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs)	(revision f4f9469d89fb6c1d214d4478bcf39b70f88de3e0)
@@ -114,6 +114,29 @@
             }
         }
 
+        [Test]
+        public void GivenFailureMechanismWithManualAssessment_WhenCreatingExportableFailureMechanism_ThenManualAssemblyIgnored()
+        {
+            // Given
+            var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
+            FailureMechanismTestHelper.AddSections(failureMechanism, 1);
+            WaveImpactAsphaltCoverFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
+            sectionResult.UseManualAssemblyCategoryGroup = true;
+            sectionResult.ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.VIIv;
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
+
+                // When
+                ExportableWaveImpactAsphaltCoverFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism);
+
+                // Then
+                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.Iv, failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single());
+            }
+        }
+
         private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly,
                                                                            FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly,
                                                                            FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly,
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Ringtoets.Integration.IO.Test.csproj
===================================================================
diff -u -ra71b1ceb1838d97cabf3abad83710ce49f9dced9 -rf4f9469d89fb6c1d214d4478bcf39b70f88de3e0
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Ringtoets.Integration.IO.Test.csproj	(.../Ringtoets.Integration.IO.Test.csproj)	(revision a71b1ceb1838d97cabf3abad83710ce49f9dced9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Ringtoets.Integration.IO.Test.csproj	(.../Ringtoets.Integration.IO.Test.csproj)	(revision f4f9469d89fb6c1d214d4478bcf39b70f88de3e0)
@@ -128,6 +128,10 @@
       <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
       <Name>Ringtoets.Common.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Primitives\Ringtoets.Common.Primitives.csproj">
+      <Project>{78AA56F5-431D-465C-AC50-3173D7E90AC1}</Project>
+      <Name>Ringtoets.Common.Primitives</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Util\Ringtoets.Common.Util.csproj">
       <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
       <Name>Ringtoets.Common.Util</Name>