PR #865 - resend/resend-node