Only resolve items in a schedule once per schedule
Merge branch 'refactor-schedule-resolution' into stage

* refactor-schedule-resolution:
  Only resolve items in a schedule once per schedule