chore: merge next into main
#8275
+21,210
−1,343
Draft
next into main
#8275