Merge pull request #10046 from mpg/fix-defrag-interleave-3.6

Fix defrag interleave 3.6