Merge pull request #10047 from mpg/fix-defrag-interleave-dev

Fix defrag interleave dev