Merge branch 'issue#18' into 'dev-v2.8.1'

SOL006 - Mirror of NFVSOL(20)000027 for v2.8.1

See merge request !75
1 job for dev-v2.8.1
in 0 seconds, using 0 compute credits, and was queued for 18 seconds