Merged with upstream/master and created ScheduleActivity that now works

I merged the upstream/master with my schedule-feature branch so there should not be any conflicts, or only small ones.