Merge branch 'main' of ssh://gifrerenom_labs.etsi.org/tfs/nsc into develop