[KFSQA-649] Did some work for DV.
[KFSQA-649] Did some more work for DV.