Merge branch 'queue-sizes'