KFSUPGRADE-972 DV Changes