CSD-36: More changes to hours module from Hongyu Shan