Merge "Fixed incorrect retry timer value type"