Merge tag 'v4.16-rc2' into locking/core, to refresh the branch