This is unrelated to this PR, but I'm happy to add a commit for that.