Merge "Adapt dashboard to a second vPing scenario"