I made a PR to GitHub before realizing that it's probably preferred to send a patch to the ML.

Patch is attached as well.

Is anyone able to  merge the PR or patch?

Thanks,

C