Merge branch 'stf605-draft' of https://forge.etsi.org/rep/mec/gs029-fai-api into stf606-draft