Merge branch 'bp/add-diff-files-optim'