Trying a different approach to orphaning fix
Merge pull request #1820 from elzj/queue_changes

Trying a different approach to orphaning fix