Bug#186 - Address additional comments received for issue#3 in NFVSOL(18)000772. See merge request !29