Merge branch 'STF525' of https://forge.etsi.org/gitlab/ITS/ITS into STF525