Merge tag 'v5.4-rc5' into next

Sync up with mainline.