It's already done with #1130 but I needed that to test this PR.