Merge branches 'next-queue' and 'next' into next