Step 7: Added cutting tools.
Fixed cleanup and shutdown ordering for dump.
Merge branch 'step-7' into step-8