Merge "Renamed retry interval to retry duration"