Merge tag 'v5.4-rc4' into docs-next