Update next-major
with changes from main
#3354
Merged
next-major
with changes from main
#3354