🔀 Merge branch “improve-following-performance” into “next”