Merge branch 'dh-test-vectors'