Update calendar events separately from building weeks
Merge branch 'speed-up-calendar-events'