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