Merge remote-tracking branch 'bonzini/nbd-next' into staging