Merge branch 'jc/diff-files-ita'