Start multi-protocol support
Update protocol support to latest upstream