Merge "Fix latency test." into klp-dev