This can be merged to master, branch 4.4 was created.

I can't have any opinion myself if this worth backporting.

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