Merge "Challenge is expected in timestamp token in case 2"