Rebase to 16.7.0 (untested!)