Backported this to 4.X for the part of the feature each branch had.

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