You're welcome.

My plan is to replace the PR with a rebased one, in December (after the 11.23 release) ; A lot has changed on the master branch since I created the PR. I'm also holding off on updating Sparrow, for the same reason.