Merge "Bind retry callback with correct this argument"