I will backport this to 4.3 if/when you're happy with it

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