Merge branch 'jk/trailers-placeholder-in-pretty'