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