Merge upstream changes

[robert3005]

No description provided.

[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 37 committers have signed the CLA.

❌ nastra
❌ rdblue
❌ manuzhang
❌ 0xMALVEE
❌ bharos
❌ Guosmilesmile
❌ hcrosse
❌ drexler-sky
❌ nssalian
❌ mxm
❌ RjLi13
❌ dramaticlly
❌ ebyhr
❌ talatuyarer
❌ davseitsev
❌ anoopj
❌ yadavay-amzn
❌ singhpk234
❌ swapna267
❌ kevinjqliu
❌ hemanthboyina
❌ adutra
❌ laserninja
❌ gaborkaszab
❌ sagib1
❌ soumyajit-sahu
❌ pvary
❌ milleniax
❌ stevenzwu
❌ oguzhanunlu
❌ Kurtiscwright
❌ aihuaxu
❌ thisismiller
❌ mukund-thakur
❌ amogh-jahagirdar
❌ huaxingao
❌ rexminnis
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[robert3005]

I have messed up merge and squashed, need to remake this