Merge pull request #1738 from CircleCI-Public/resource-usage