Merge "Add latency constraint"