Merge branch 'Integration_Rel19_SA5_159_CH_ASN' into 'Rel-19'

Merge branch 'Integration_Rel19_SA5_159_ASN' into 'Rel-19'

See merge request !40