Merge Academy cooldown change?

This am noticed 1) overnight crystals not replenished (seems to have corrected itself) 2) cooldown for Baskets & Wool and Bag of Seeds is no longer 2 hours but has tied to the 12 hour reset of room...