Incorporate new csd-7 hive to fix timestamp bug.