Merge "Add support for VXLAN latency"