When using upsertQueryEntries to upsert ~5000 entries, the performance massively degraded after the update from 2.6.0 to 2.6.1 making the browser hang completely for a few seconds where it was previously performing well.

I suspect #4872 to be the cause of the issue, though I have not traced it down completely to this specific commit.
But I can confirm the upsertQueryEntries is performing well in 2.6.0 while it is making the browser hang for ~5s after the update to 2.6.1 using the same code.