Merge from upstream

[0xKiwi]

References to other Issues or PRs

Have you read the Contributing Guidelines?

Brief description of what is fixed or changed

Other comments

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 13 committers have signed the CLA.

❌ kkolur
❌ laurentsimon
❌ tech-sumit
❌ gostajonasson
❌ johanbrandhorst
❌ ionling
❌ hariso
❌ jonathaningram
❌ stomy13
❌ krak3n
❌ asraa
❌ sashamelentyev
❌ dependabot[bot]
_{You have signed the CLA already but the status is still pending? Let us recheck it.}