Merge branch 'jk/pretty-empty-format'