Merge branch 'Rel18_CR1544_28.541_Fix_stage3_related_to_UpfInfo' into...

Merge branch 'Rel18_CR1544_28.541_Fix_stage3_related_to_UpfInfo' into 'Integration_Rel18_SA5_161_YAML'

Rel18_CR1544_28.541_Fix_stage3_related_to_UpfInfo

See merge request !1761