Merge tag 'v4.20' into next

Merge with mainline to bring in the new APIs.