Merged in calendar-view feature branch