@tsahlin the changes itself are good, but please split them up into two commits

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