Rebase to 16.6.2