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