Merge "Populate new fields in time- and calendar-schedule modes" into main