Merge branch 'issue#29' into 'dev-v3.5.1'

issue#29 Fixes IFA014ed341-IFA015_harmonization_corrections, set2 and addressing data inconsistency

See merge request nfv/SOL006!86