backported sfs/dv changes