Merge "Add Logging to specify next retry"