Merge "Compute correct rejected time" into pi-dev