Can be merged and backported if needed.

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