chore: resolve conflicts between main and next

[martimalek]

What

Resolve conflicts between next and main ​

Why

To be able to merge next into main to have the 2.x.x in the main branch ​

How

Merge main into next and resolve conflicts 😅

[github-actions[bot]]

:tada: This PR is included in version 2.1.0 :tada:

The release is available on:

• npm package (@latest dist-tag)
• GitHub release

Your semantic-release bot :package::rocket:

[github-actions[bot]]

:tada: This PR is included in version 1.34.4 :tada:

The release is available on:

• npm package (@release-1.34.x dist-tag)
• GitHub release

Your semantic-release bot :package::rocket: