I also don't see this patch landing in 5.4 (rc1 doesn't have it). Should we keep applying it manually for now?