Merge retry_interval changes with upstream