Merge branch 'main' into release-next