better prune and system df Upstream-commit: b5cbd84439d212f658a065eda5f7797223853874 Component: engine