Merge branch 'jk/commit-use-no-divider-with-interpret-trailers'