Merge branch 'feature/date-changes' into develop