Merge branch 'feat/hackfest5' of ssh://gifrerenom_labs.etsi.org/tfs/controller...

Merge branch 'feat/hackfest5' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/231-merge-hackfest-5-in-develop-and-related-code-fixes