Merge branch 'Rel18_CR_TS_28.622_Correction_to_AreaScope' into 'Integration_Rel18_SA5_156_YAML'
Rel18_CR0425_TS_28.623_Correction_to_AreaScope_stage3_YAML See merge request !1266
Rel18_CR0425_TS_28.623_Correction_to_AreaScope_stage3_YAML See merge request !1266