Merge pull request #1727 from public/dh-key-iface-2015

DH key interfaces