Apart from the missing manual update and merge conflict (easy to fix), untested but looks good.

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