Merge remote-tracking branch 'kiszka/queues/slirp' into staging