> This is ok with that change, with whatever minor changes are needed to
> account for the changes to patch #1.
>

Updated patch attached, will commit once patch 1 is approved.