Merge branch 'jk/pretty-encoding-doc'