Merge branch 'release2' of https://forge.etsi.org/rep/tijinkj/imzm_ts103724 into release2