[*] Backport changes from the release candidate. Related to determining the node address for the order.