Merge branch...

Merge branch 'Rel18_CR1411_TS28541_correction_to_stage_2_and_stage_3_attribute_name_inconsistenc' into 'Integration_Rel18_SA5_158_YAML'

Rel18 TS28541 CR1411 correction to stage 2 stage3 attribute name inconsistence

See merge request !1481