Merge "Fixed bug in cross-broker RPC routing"