> I propose the attached diff, with a backport to 18.

Looks good, thanks!


Reply via email to