Merge pull request #4744 from annando/queue-improvements