merged 0022-pairing-proxy-connection-broker.patch