Merge "Fix stuck node requests across ZK reconnection"