Merge pull request #10056 from minosgalanakis/feature_merge_defragmentation_36

Merge defragmentation feature branch onto 3.6