Don't build inactive connection queues.
Merge branch 'master' into support/2.0