Merge "Fix the latency model." into oc-dev