Change event for cooldowns
Merge branch 'master' into 6.0.1