Merge branch 'issue#12' into 'dev-v3.3.1'

#12 - SOL006ed331 FEAT03 - NFVI MOD

See merge request !69
1 job for dev-v3.3.1
in 0 seconds, using 0 compute credits, and was queued for 14 seconds