Yes, can you send those two patches in a new issue? I tried applying it manually just now but it doesn't apply.

Don't close this issue. I'll reference the new issue here and close both after I review it and merge if good.

all best,

jgart