Merge pull request #1750 from CircleCI-Public/follow-the-rules