Merge branch 'as/pretty-truncate'