Merge "Update latency measurements"