WIP: Merge in (and merge) DHE-DL and ECC support as discussed
at interim and on-list.
Add open issue