Patch #5 applied cleanly and there are no further deprecations.
We can merge ...