Fix system df
issues with -f
and -v
#16234
Merged
system df
issues with -f
and -v
#16234