Merge branch 'NFV-SOL005-Review' into 'master'

Nfv sol005 review

See merge request !7
1 job for master
in 0 seconds, using 0 compute credits, and was queued for 6 seconds