Going to merge this pull request, waiting here for a while. Patch looks ok. If any adjustments, then can be done directly on the merged code.

—
Reply to this email directly or view it on GitHub.