I have updated the attached patches to the latest versioned commits. I believe the recommended fixes are all in place.

Thanks,
Greg