Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more