Merge remote-tracking branch 'bonzini/split-main-loop-for-anthony' into staging