These seem to have come from #1382 so should rebase, since that has now been merged