Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2021-02-04' into staging