Update next
branch with changes from main
#10572
Merged
next
branch with changes from main
#10572