Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-03-16-v4' into staging