Merge branch 'dc/format-pretty'