Merge remote-tracking branch 'origin/fix/node-stopping-bg-payments' into fix/stale-graph-reset

Author: ovitrif