Merge remote-tracking branch 'bonzini/stub' into staging