Merge pull request #1035 from github/michaelrfairhurst/new-shared-que…

Merge pull request #1035 from github/michaelrfairhurst/new-shared-que… #4115