Got rid of minimalist PCP proxy draft - it was bad idea anyway.
Merge branch 'master' into hncp-pre-01
Wordsmithed the border discovery to have a list of explicit steps.
Added hybrid category.