diff --git a/patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index ca70b3bf61..92e1678e57 100644
--- a/patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -18,4 +18,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            // Paper end
              // Spigot start
              double radius = level.spigotConfig.itemMerge;
-             List<ItemEntity> list = this.level.getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, radius, radius), (entityitem) -> {
+             List<ItemEntity> list = this.level.getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, radius - 0.5D, radius), (entityitem) -> {
diff --git a/patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch
index 96a791f311..dc6eeb7fda 100644
--- a/patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -137,7 +137,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                                } // else: no collision at all detected, why do we care?
 +                            }
 +                            if (!this.player.noPhysics && !this.player.isSleeping() && teleportBack) { // Paper end - optimise out extra getCubes
-                                 this.teleport(d3, d4, d5, f, f1);
+                                 this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet(), false); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
                              } else {
                                  // CraftBukkit start - fire PlayerMoveEvent
 @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/work/CraftBukkit b/work/CraftBukkit
index d48f2d1a50..95d233dc5b 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit d48f2d1a508937908a7fb9169d29f53f1b34ab76
+Subproject commit 95d233dc5b5ab0bf125ce761ace782bc2f1ac78e
diff --git a/work/Spigot b/work/Spigot
index b6d12d17cd..b081915002 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit b6d12d17cd1763d488a42cb9f3e6c424de5f12a8
+Subproject commit b0819150028ec7233960ec622a4b1ba57f102047