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