Merge "Store cooldown state through rotation"