Merge branch 'nd/pretty-formats'