Merge "Refine the SchedulesProvider" into rvc-dev