Merge "Allow disk I/O while performing dump()."