Merge pull request #1757 from CircleCI-Public/watch-clock-generation