Hi!

Is there anything to be fixed in order to upstream this patch?

Sent with [ProtonMail](https://protonmail.com/) Secure Email.