Applied the patch in #2, worked cleanly, please see the screens.