Merge branch 'feat/hackfest3' of https://labs.etsi.org/rep/tfs/controller into feat/hackfest3