DiffInfo - refactoring
Merge origin/master