chore: Merge branch master into rc/v12.0.0
#2503
+1,248
−820
Closed