Merge pull request #1710 from CircleCI-Public/handle-queued