diff --git a/src/channel.c b/src/channel.c
index 75fc89560c..f8a8194374 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -3997,6 +3997,11 @@ channel_read_json_block(
 	    if (channel_parse_messages())
 		continue;
 
+	    // channel_parse_messages() may fill the queue with new data to
+	    // process.
+	    if (channel_has_readahead(channel, part))
+		continue;
+
 	    // Wait for up to the timeout.  If there was an incomplete message
 	    // use the deadline for that.
 	    timeout = timeout_arg;
diff --git a/src/version.c b/src/version.c
index 23b2a1e2bc..120633f0fa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4699,
 /**/
     4698,
 /**/