Revert "Revert "HCI v2""

This reverts commit a948309381eb1047d701a4b34de38fe0f2e5a5a9.