Merge branch 'STF678_Task1_2_MEC030' of https://forge.etsi.org/rep/mec/AdvantEDGE into STF678_Task1_2_MEC030