Merge branch '1-export-date-timestamp-format'