Merge branch 'net-queue'