Merge pull request #1693 from CircleCI-Public/lfg