Merge branch 'queue' into next