Merge branch 'as/pretty-truncate' into maint