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