Merge branch 'Rel_18_CR_draftCR_to_CR' into 'Integration_Rel18_SA5_152_YAML'

Rel-18_TS28538_CR0055_S5-238239_Update TS28538_EdgeNrm.yaml

See merge request !952