Merge branch 'issue#26' into 'dev-v3.5.1'
issue#26 Fixes for IFA011ed341 based on 942 part1, part2 and part3 See merge request nfv/SOL006!83
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
issue#26 Fixes for IFA011ed341 based on 942 part1, part2 and part3 See merge request nfv/SOL006!83