Sync fork

[blaginin]

No description provided.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[AdamGS]

I know understand why you didn't merge this, I hope I didn't break anything here

[AdamGS]

I don't think we should do a PR here, I'll just rebase on the upstream repo and push it to main directly.