Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging