Patches pushed as 870f2d40e055d57659dff0dc20b903522f055bb0 and
following.
Thanks.