Reduce the number of hints/extensions by only generating for extensions that are a member of a queue.
Merge branch 'master' into develop