Merge branch...

Merge branch 'TS28.623_Rel18_correction_to_duplicate_Scope_definition_and_misalignment' into 'Integration_Rel18_SA5_156_YAML'

TS28.623 Rel18 CR0388 correction to duplicate Scope definition and misalignment

See merge request !1262