Merge "Revert "Handle negative delays and deadlines."" into main