Merge pull request #9035 from annando/daemon-cooldown