Merge branch 'jk/diff-filespec-cleanup'