Resolves issue #1646, #1645#1656

david-rocca merged 11 commits intodevCVEProject/cve-services:devfrom

dr_test_take3CVEProject/cve-services:dr_test_take3Copy head branch name to clipboard