Merge tag 'v6.18' into next

Sync up with the mainline to bring in the latest APIs.