Does anyone have any comments on my fix?
Can I merge and backport?

—
Reply to this email directly or view it on GitHub.