Merge branch 'day-grid' into updated-day-grid