Merge branch 'release/main' into stable/main