Merge branch 'rr/parse-date-refactor'