Merge main into release/6.3
#9534
+484
−301
Draft
main into release/6.3
#9534