@b4n No problem, will ping you at the beginning of the next release cycle (will fix the merge conflicts then in case something else introduces more conflicts in the meantime).

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