Merge branch 'WI-001958' of https://forge.etsi.org/rep/ITS/asn1/avp_ts103882 into WI-001958