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