Merge branch 'feature/231-schedule-legend' into staging