Merge branch 'Integration_Rel18_SA5_158_CH_YAML' into 'Rel-18'

Integration Rel18 SA5 158 Charging Yaml to Release branch after SA#106

See merge request !22