Merge pull request #8898 from dstftw/fragment-retries