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