Merge master branch to resolve conflicts

Co-authored-by: granatonatalia <[email protected]>

Author: Copilot