Backport vmware-graph-improvement from NMS-6134