Merge branch 'Rel_18_CR0110_28.536_Fix_mismatch_between_stage_2_and_stage_3'...

Merge branch 'Rel_18_CR0110_28.536_Fix_mismatch_between_stage_2_and_stage_3' into 'Integration_Rel18_SA5_158_YAML'

Rel_18_CR0110_28.536_Fix_mismatch_between_stage_2_and_stage_3

See merge request !1497