Merge branch 'Integration_Rel19_SA5_164_CH_ASN' into 'Rel-19'

Integration_Rel19_SA5_164_CH_ASN into Rel-19

See merge request !119