Merge "Kpi-computation-ms - Vulnerability updates"