Rebase to 17.2.0 (untested!)