Merge tag 'pull-xen-20230607' of https://xenbits.xen.org/git-http/people/aperard...