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