Add warning cooldown
Merge origin/master