Merge branch...

Merge branch 'Rel19_CR_TS_28.541_Correction_on_inconsistent_definition_in_stage3' into 'Integration_Rel19_SA5_162_YAML'

Rel19_CR1590_TS_28.541_Correction_on_inconsistent_definition_in_stage3

See merge request !1847