Merge pull request #6392 from dstftw/generalized-fragmented-fd