Merge branch 'sk/diff-files-show-i-t-a-as-new'