Certainly, Martin.  I'm in the process of getting it updated and self-reviewing again.  This patch will require #20586 and possibly another new Clinic feature (allowing output to multiple destinations; I have a change for that feature on my issue20172 sandbox branch, but don't remember why and never got an issue made for it) before commit.

I'll try to have a fresh patch up here within a week or so.