Update 'next-2.x' with latest changes from 'main'

assigned to @peat

added 3 commits

• 15c45519...d448b003 - 2 commits from branch next-2.x
• 16d61ef4 - Merge branch 'next-2.x' into 'main'

Compare with previous version

added 2 commits

• a044c36c - 1 commit from branch next-2.x
• e672c2b4 - Merge branch 'next-2.x' into 'main'

Compare with previous version

added 3 commits

• e672c2b4...9bae2532 - 2 commits from branch next-2.x
• 2cfb45a2 - Merge branch 'next-2.x' into 'main'

Compare with previous version

added 2 commits

• 3fa1072f - 1 commit from branch next-2.x
• 3607b597 - Merge branch 'next-2.x' into 'main'

Compare with previous version

added 3 commits

• 3607b597...0a84f48c - 2 commits from branch next-2.x
• dd0a3da6 - Merge branch 'next-2.x' into 'main'

Compare with previous version

added 3 commits

• dd0a3da6...f4499e43 - 2 commits from branch next-2.x
• a89de27c - Merge branch 'next-2.x' into 'main'

Compare with previous version

added 3 commits

• a89de27c...c296e2ff - 2 commits from branch next-2.x
• 672ebd18 - Merge branch 'next-2.x' into 'main'

Compare with previous version

added 4 commits

• 672ebd18...aecfc937 - 3 commits from branch next-2.x
• 5d4b3656 - Merge branch 'next-2.x' into 'main'

Compare with previous version

added 2 commits

• 1a890131 - 1 commit from branch next-2.x
• 4a553f48 - Merge branch 'next-2.x' into 'main'

Compare with previous version