Merge branch 'enable-fragmentation'