Merge "TIF: Fix comments for program start/end times" into nyc-dev