Merge branch 'tb/pretty-format-cd-date-format'