Merge "Handle negative delays and deadlines." into main