Merge branch 'jk/no-diff-emit-common'