Rebase to 16.3.0 (untested!)