I forgot to mention it in the cover letter but v12 also addresses Pierrick's comments to clean up the patch plug-in. Thanks for the feedback!