Merge branch 'jk/date-local'