Merge branch 'jk/date-mode-format'