Change in centroid delete behavior
Merge remote-tracking branch 'origin/reorganization'