Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-mttcg' into staging