Upstream merge

[hazbo]

Fixes #

Motivation

Explain here the context, and why you're making that change. What is the problem you're trying to solve.

Modifications

Describe the modifications you've done.

Verifying this change

• [ ] Make sure that the change passes the CI checks.