Rebase to 17.0.0 (untested!)