Merge "Vulnerability removal for VES-mapper Issue-ID: DCAEGEN2-2596"