Shayan/upstream ddfs change fix