Fix two issues: 1) BVSP merging candidate uses the DV from NBDV instead of DoNBDV; 2) ticket #36 for 3D-HTM