Merge branch 'develop' of https://forge.etsi.org/rep/mec/gs028-wai-api into develop