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

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

See merge request nfv/SOL006!75