 +    atomicSet(server.stat_net_output_bytes, 0);
      server.stat_unexpected_error_replies = 0;
      server.aof_delayed_fsync = 0;
-     server.blocked_last_cron = 0;
-@@ -4186,6 +4193,8 @@ sds genRedisInfoString(const char *section) {
+ }
+@@ -4166,6 +4173,8 @@ sds genRedisInfoString(const char *section) {
              call_uname = 0;
          }
-
+ 
 +        unsigned int lruclock;
 +        atomicGet(server.lruclock,lruclock);
          info = sdscatfmt(info,
              "# Server\r\n"
              "redis_version:%s\r\n"
-@@ -4230,7 +4239,7 @@ sds genRedisInfoString(const char *section) {
+@@ -4210,7 +4219,7 @@ sds genRedisInfoString(const char *section) {
              (int64_t)(uptime/(3600*24)),
              server.hz,
              server.config_hz,

  * able to create users, set ACLs to such users, and later authenticate
  * clients using such newly created users. */
diff --git a/src/networking.c b/src/networking.c
index 6becdc288da..3fa298783fc 100644
--- a/src/networking.c
+++ b/src/networking.c
@@ -103,7 +103,8 @@ client *createClient(connection *conn) {
     }

     selectDb(c,0);
-    uint64_t client_id = ++server.next_client_id;
+    uint64_t client_id;

         sdsrange(slave->replpreamble,nwritten,-1);
         if (sdslen(slave->replpreamble) == 0) {
             sdsfree(slave->replpreamble);
@@ -1054,7 +1054,7 @@ void sendBulkToSlave(connection *conn) {
         return;
     }
     slave->repldboff += nwritten;
