Merge pull request #10057 from minosgalanakis/feature_merge_defragmentation_dev

Merge defragmentation feature branch onto development