Merge tag 'v5.16' into next

Sync up with mainline to bring in the latest API changes.