diff --git a/process/general_concepts/_assets/score_building_blocks_meta_model.drawio.svg b/process/general_concepts/_assets/score_building_blocks_meta_model.drawio.svg
index 9a4cf52266..d0abde036f 100644
--- a/process/general_concepts/_assets/score_building_blocks_meta_model.drawio.svg
+++ b/process/general_concepts/_assets/score_building_blocks_meta_model.drawio.svg
@@ -1,2273 +1,4 @@
-
+
+
+
+
diff --git a/process/general_concepts/_assets/score_building_blocks_meta_model_deployment_example.drawio.svg b/process/general_concepts/_assets/score_building_blocks_meta_model_deployment_example.drawio.svg
index cf1cb1a3b3..d181a6210c 100644
--- a/process/general_concepts/_assets/score_building_blocks_meta_model_deployment_example.drawio.svg
+++ b/process/general_concepts/_assets/score_building_blocks_meta_model_deployment_example.drawio.svg
@@ -1,2532 +1,4 @@
-
+
+
+
+
diff --git a/process/general_concepts/_assets/score_traceability_model_cmp_overview_1.drawio.svg b/process/general_concepts/_assets/score_traceability_model_cmp_overview_1.drawio.svg
index e353683ec6..1eb3abb9e6 100644
--- a/process/general_concepts/_assets/score_traceability_model_cmp_overview_1.drawio.svg
+++ b/process/general_concepts/_assets/score_traceability_model_cmp_overview_1.drawio.svg
@@ -1,4 +1,4 @@
-
+
diff --git a/process/general_concepts/_assets/score_traceability_model_cmp_overview_2.drawio.svg b/process/general_concepts/_assets/score_traceability_model_cmp_overview_2.drawio.svg
index f83d4c29c2..67f73ae213 100644
--- a/process/general_concepts/_assets/score_traceability_model_cmp_overview_2.drawio.svg
+++ b/process/general_concepts/_assets/score_traceability_model_cmp_overview_2.drawio.svg
@@ -1,4 +1,4 @@
-
+
diff --git a/process/general_concepts/_assets/score_traceability_model_cmp_overview_3.drawio.svg b/process/general_concepts/_assets/score_traceability_model_cmp_overview_3.drawio.svg
index 92b647b770..df83ab4e4a 100644
--- a/process/general_concepts/_assets/score_traceability_model_cmp_overview_3.drawio.svg
+++ b/process/general_concepts/_assets/score_traceability_model_cmp_overview_3.drawio.svg
@@ -1,4 +1,4 @@
-
+
-
\ No newline at end of file
+
diff --git a/process/general_concepts/_assets/score_traceability_model_feat_overview.drawio.svg b/process/general_concepts/_assets/score_traceability_model_feat_overview.drawio.svg
index a2135d9bb8..f80d86f046 100644
--- a/process/general_concepts/_assets/score_traceability_model_feat_overview.drawio.svg
+++ b/process/general_concepts/_assets/score_traceability_model_feat_overview.drawio.svg
@@ -1,4 +1,4 @@
-
+
diff --git a/process/general_concepts/_assets/score_traceability_model_wp_overview.drawio.svg b/process/general_concepts/_assets/score_traceability_model_wp_overview.drawio.svg
index 3acd77918c..07fa6ddc33 100644
--- a/process/general_concepts/_assets/score_traceability_model_wp_overview.drawio.svg
+++ b/process/general_concepts/_assets/score_traceability_model_wp_overview.drawio.svg
@@ -1,4 +1,4 @@
-
+
diff --git a/process/general_concepts/score_building_blocks_concept.rst b/process/general_concepts/score_building_blocks_concept.rst
index 645d340ef5..600b388aaa 100644
--- a/process/general_concepts/score_building_blocks_concept.rst
+++ b/process/general_concepts/score_building_blocks_concept.rst
@@ -39,13 +39,12 @@ as a Safety Element out of Context (**SEooC**) and it can be delivered as part o
Delivery Container (green box, top, 1st column). The objectives of the platform are
expressed as concrete **Stakeholder Requirements** (blue box, top, 4th column), which
can be tested by provided **Platform Integration Tests** (blue box, top, 6th column)
-for reference hardware platforms. A **Platform Safety/Security Analysis**
-(blue box, top, 7th column) is required to verify the Feature Architectures, whereby
-violations of safety/security requirements must be documented. Potential faults
-may mitigated by updating the Stakeholder Requirements or by **Assumptions of Use**
-(white box, 8th column).
+for reference hardware platforms. A **Platform Safety/Security Analysis**
+(blue box, top, 7th column) is required to verify **Platform Architecture** (including feature dependencies),
+whereby violations of safety/security requirements must be documented. Potential faults
+may be mitigated by updating the Stakeholder Requirements or by **Assumptions of Use** (white box, 8th column).
-The platform consists of **Features** (yellow box, middle, 2nd column).
+The platform consists of **Features** (yellow box, middle, 2nd column) defining a **Platform Architecture**.
Further the project provides **Dependable Elements** (red box, middle, 1st column),
which can also be developed as a SEooC and are delivered as part of a **Delivery
diff --git a/process/general_concepts/score_traceability_concept.rst b/process/general_concepts/score_traceability_concept.rst
index f006c4176b..6dbee63936 100644
--- a/process/general_concepts/score_traceability_concept.rst
+++ b/process/general_concepts/score_traceability_concept.rst
@@ -68,7 +68,7 @@ of use. For convenience also the traceability to upper and lower lever requireme
The next figures sets the focus on the component level and adds the traceability from the
Component Requirements to the Component Architecture, Component Safety/Security Analysis
-and the Component Assumption of use. Further the traceability to Component Assumptions of use
+and the Component Assumption of use. Further the traceability to Assumptions of use
from external components is included.
@@ -89,8 +89,8 @@ addition also needed to their architectures.
High level traceability overview for project component work products including sub-components
-Or less complex components may not require a Component Architecture, the traceability is not
-required as the architecture can be skipped.
+Or less complex components may not require a Component Architecture (and the derived work products
+Component Safety/Security Analysis and AoUs). Then the traceability is not required for these.
.. figure:: _assets/score_traceability_model_cmp_overview_3.drawio.svg
:width: 100%
diff --git a/process/process_areas/architecture_design/guidance/architecture_process_reqs.rst b/process/process_areas/architecture_design/guidance/architecture_process_reqs.rst
index f5fafeb4aa..04ee125e8a 100644
--- a/process/process_areas/architecture_design/guidance/architecture_process_reqs.rst
+++ b/process/process_areas/architecture_design/guidance/architecture_process_reqs.rst
@@ -164,20 +164,20 @@ Traceability to Requirements and AoU
.. gd_req:: Architecture attribute: fulfils
:id: gd_req__arch_attr_fulfils
:status: valid
- :tags: manual_prio_1, attribute, mandatory
+ :tags: manual_prio_1, attribute
:complies: std_req__iso26262__support_6425, std_req__aspice_40__SWE-2-BP4
:satisfies: wf__cr_mt_featarch, wf__cr_mt_comparch
- Each architectural view (feature/comp_arc_sta, feature/comp_arc_dyn) and interface (logic/real_arc_int) shall be linked to a requirement.
+ Architectural views (feature/comp_arc_sta, feature/comp_arc_dyn) and interfaces (logic/real_arc_int) should be linked to a requirement.
.. gd_req:: Architecture attribute: fulfils (AoU)
:id: gd_req__arch_attr_fulfils_aou
:status: valid
- :tags: manual_prio_1, attribute, mandatory
+ :tags: manual_prio_1, attribute
:complies: std_req__iso26262__support_6425, std_req__aspice_40__SWE-2-BP4
:satisfies: wf__cr_mt_featarch, wf__cr_mt_comparch
- Each architectural static view (feature/comp_arc_sta) shall be linked to AoUs if the element (feature/comp) fulfills these.
+ Architectural elements (feat_arc_sta, comp) shall be linked to AoUs if the element fulfills these.
.. gd_req:: Architecture traceability
:id: gd_req__arch_traceability