Merge branch 'summer-hours-fixes' into prod
Merge branch 'summer-hours-fixes' into prod