Adjust white-spaces of added lines
Merge branch 'dumpatshutdown'