Cherry-picked. Thanks.

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