Merge pull request #1717 from CircleCI-Public/fake-circle-refinement