backported to 4.1 and 4.2

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