Merge branch 'next-queue' into next