Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict