Merge branch 'ns/pretty-format' into next