Merge branch 'jn/merge-diff3-label'